From 3112d63fd0d52308944881cd189a5aacc98d0dac Mon Sep 17 00:00:00 2001
From: John Mertic <jmertic@John-Mertics-iMac.local>
Date: Fri, 20 Jul 2012 12:55:45 -0400
Subject: [PATCH] Release 6.5.1

---
 ModuleInstall/ModuleInstaller.php             | 153 +++-
 .../PackageManager/PackageManager.php         |  24 +-
 .../PackageManager/PackageManagerDisplay.php  |  11 +-
 .../PackageManager/tpls/PackageForm.tpl       |   7 +-
 Zend/Oauth/Provider.php                       |   2 +-
 cache/include/javascript/sugar_field_grp.js   |  17 +-
 cache/include/javascript/sugar_grp1.js        |  22 +-
 cache/include/javascript/sugar_grp1_jquery.js |   2 +-
 cache/include/javascript/sugar_grp_emails.js  |  17 +-
 cache/include/javascript/sugar_grp_jsolait.js |   3 +-
 .../include/javascript/sugar_grp_quickcomp.js |  14 +-
 data/BeanFactory.php                          |  18 +-
 data/Link2.php                                |   3 +-
 .../EmailAddressRelationship.php              |  15 +
 data/Relationships/M2MRelationship.php        |  21 +
 data/Relationships/One2MBeanRelationship.php  |  36 +-
 data/Relationships/One2MRelationship.php      |  33 +-
 data/Relationships/SugarRelationship.php      |  25 +
 data/SugarBean.php                            |  90 ++-
 download.php                                  |   8 +-
 files.md5                                     | 527 ++++++-------
 include/EditView/EditView2.php                |   4 +
 include/EditView/SubpanelQuickCreate.php      |  55 +-
 include/ListView/ListView.php                 |  30 +-
 include/ListView/ListViewData.php             |   3 +
 include/ListView/ListViewDisplay.php          |   6 +-
 include/ListView/ListViewPagination.tpl       |   4 +-
 include/MVC/SugarApplication.php              |   5 +-
 include/MVC/View/SugarView.php                |   8 +-
 include/MVC/View/views/view.detail.php        |   2 +-
 include/MVC/View/views/view.edit.php          |   2 +-
 include/MVC/View/views/view.list.php          |  13 +-
 include/MVC/View/views/view.popup.php         |  10 +-
 include/Popups/tpls/PopupGeneric.tpl          |   2 +-
 include/SearchForm/SearchForm.php             |   4 +-
 include/SearchForm/SearchForm2.php            |  19 +-
 .../plugins/function.sugar_action_menu.php    |  42 +-
 .../Smarty/plugins/function.sugar_menu.php    |   2 +-
 .../plugins/function.sugar_number_format.php  |   4 +-
 .../Smarty/plugins/function.sugar_phone.php   |   2 +-
 include/SubPanel/SubPanel.php                 |   1 -
 include/SubPanel/SubPanelDefinitions.php      |  55 +-
 include/SubPanel/SubPanelTiles.js             |   3 +-
 include/SubPanel/SubPanelTiles.php            |  12 +-
 include/SugarCharts/Jit/js/sugarCharts.js     |  12 +-
 include/SugarCharts/SugarChart.php            |   3 +-
 .../Fields/Datetime/SugarFieldDatetime.php    |  13 +-
 .../Fields/Datetimecombo/Datetimecombo.js     |  17 +-
 .../Datetimecombo/SugarFieldDatetimecombo.php |  54 +-
 include/SugarFields/Fields/Link/EditView.tpl  |   6 +-
 .../SugarFields/Fields/Parent/SearchView.tpl  |   2 -
 .../Fields/Relate/SugarFieldRelate.php        |   2 +-
 include/SugarFolders/SugarFolders.php         |   6 +-
 .../SugarObjects/templates/file/vardefs.php   |   3 +-
 .../SugarObjects/templates/issue/vardefs.php  |   1 +
 .../person/metadata/subpanels/default.php     |   1 +
 include/SugarTheme/SugarTheme.php             |   8 +-
 include/Sugar_Smarty.php                      |  18 +-
 include/clean.php                             |   7 +-
 .../connectors/utils/ConnectorHtmlHelper.php  | 168 +++++
 .../utils/ConnectorHtmlHelperFactory.php      |  65 ++
 include/connectors/utils/ConnectorUtils.php   | 113 +--
 include/database/DBManager.php                |  27 +-
 include/database/MssqlManager.php             |  32 +-
 include/database/MysqlManager.php             |   5 +-
 include/generic/LayoutManager.php             |  12 +
 include/generic/Save2.php                     |  63 +-
 include/generic/SugarWidgets/SugarWidget.php  |  10 +
 .../SugarWidgets/SugarWidgetFielddate.php     |  14 +
 .../SugarWidgets/SugarWidgetFielddatetime.php |   6 +-
 .../SugarWidgets/SugarWidgetFieldenum.php     |  20 +-
 .../SugarWidgetFieldmultienum.php             |  41 +-
 .../SugarWidgets/SugarWidgetFieldrelate.php   |  10 +-
 .../SugarWidgets/SugarWidgetReportField.php   |   2 +-
 .../SugarWidgetSubPanelDetailViewLink.php     |   4 +
 .../SugarWidgetSubPanelRemoveButton.php       |   5 +-
 ...garWidgetSubPanelTopArchiveEmailButton.php |   4 +-
 .../SugarWidgetSubPanelTopButton.php          |  38 +-
 ...garWidgetSubPanelTopComposeEmailButton.php |   6 +
 ...ubPanelTopCreateCampaignLogEntryButton.php |  29 +-
 .../SugarWidgetSubPanelTopSelectButton.php    |  28 +-
 ...rWidgetSubPanelTopSelectContactsButton.php |   5 -
 ...ugarWidgetSubPanelTopSelectUsersButton.php |   5 -
 include/globalControlLinks.php                |   1 +
 include/javascript/ajaxUI.js                  |   4 +-
 include/javascript/jquery/jquery.sugarMenu.js |   2 +-
 include/javascript/jsclass_async.js           |   3 +-
 include/javascript/quickCompose.js            |   2 +-
 include/javascript/sugar_3.js                 |  14 +-
 include/language/en_us.lang.php               |   9 +-
 include/modules.php                           |   1 -
 include/php-sql-parser.php                    |   2 +-
 include/upload_file.php                       |  68 ++
 include/utils.php                             |  92 ++-
 include/utils/autoloader.php                  |   2 +-
 include/utils/file_utils.php                  |  11 +
 include/utils/security_utils.php              |   2 +-
 include/utils/sugar_file_utils.php            |  10 +-
 install/confirmSettings.php                   |  26 +-
 install/install_utils.php                     |  10 +
 install/language/en_us.lang.php               |   1 +
 json_server.php                               |   6 +-
 jssource/JSGroupings.php                      |   1 -
 .../include/SubPanel/SubPanelTiles.js         |   8 +-
 .../include/SugarCharts/Jit/js/sugarCharts.js |  33 +
 .../Fields/Datetimecombo/Datetimecombo.js     |  68 +-
 .../src_files/include/javascript/ajaxUI.js    |   7 +
 .../include/javascript/jsclass_async.js       |   8 +-
 .../include/javascript/quickCompose.js        |   1 +
 .../src_files/include/javascript/sugar_3.js   |  32 +-
 jssource/src_files/modules/Calendar/Cal.js    |   6 +-
 .../modules/Meetings/duration_dependency.js   | 115 +--
 metadata/audit_templateMetaData.php           |   2 +-
 modules/ACL/ACLController.php                 |   6 +-
 modules/ACLActions/ACLAction.php              |  17 +-
 modules/Accounts/Account.php                  |  11 +-
 modules/Accounts/metadata/subpaneldefs.php    |   1 +
 modules/Accounts/vardefs.php                  |   7 -
 modules/Activities/Popup_picker.php           |   7 +-
 modules/Administration/Diagnostic.php         |   4 +
 modules/Administration/DiagnosticDelete.php   |   4 +
 modules/Administration/DiagnosticDownload.php |   4 +
 modules/Administration/DiagnosticRun.php      |   4 +
 modules/Administration/DisplayWarnings.php    |  11 +
 modules/Administration/SugarSpriteBuilder.php |   4 +-
 .../Administration/language/en_us.lang.php    |  12 +-
 .../metadata/adminpaneldefs.php               |  10 +-
 modules/Administration/views/view.backups.php |   4 +
 modules/Calendar/Cal.js                       |   6 +-
 modules/Calendar/CalendarGrid.php             |  16 +-
 modules/Calls/Call.php                        |  20 +-
 modules/Calls/CallFormBase.php                |   5 +-
 modules/CampaignLog/language/en_us.lang.php   |   3 +
 modules/CampaignLog/vardefs.php               |  63 +-
 modules/Campaigns/Campaign.php                |   5 +
 modules/Campaigns/WebToLeadCapture.php        |   5 +
 modules/Campaigns/WebToLeadDownloadForm.html  |  21 +-
 modules/Campaigns/WebToLeadFormSave.php       |  53 +-
 modules/Campaigns/WizardHome.php              |   5 +-
 modules/Campaigns/WizardMarketing.html        |   2 +-
 modules/Campaigns/language/en_us.lang.php     |   1 +
 modules/Campaigns/metadata/detailviewdefs.php |   2 +-
 modules/Campaigns/utils.php                   |   8 +-
 modules/Campaigns/views/view.detail.php       |   4 +-
 modules/Cases/Case.php                        |   2 +-
 .../MyPipelineBySalesStageDashlet.php         |  20 +-
 modules/Configurator/Configurator.php         |  12 +-
 modules/Configurator/Forms.php                |   6 +
 modules/Configurator/LogView.php              |  16 +-
 modules/Configurator/language/en_us.lang.php  |   4 +-
 modules/Configurator/tpls/EditView.tpl        |  20 +-
 modules/Configurator/tpls/adminwizard.tpl     |  22 +-
 .../sources/ext/rest/linkedin/config.php      |   2 -
 .../ext/rest/linkedin/language/en_us.lang.php |   2 +-
 modules/Contacts/AcceptDecline.php            |  26 +-
 modules/Contacts/Contact.php                  |   3 -
 modules/Contacts/ContactFormBase.php          |  78 +-
 modules/Contacts/Popup_picker.php             | 101 +--
 modules/Contacts/metadata/quickcreatedefs.php |   2 +
 modules/Contacts/tpls/QuickCreate.tpl         |   4 +-
 modules/Contacts/vardefs.php                  |   2 +-
 modules/Contacts/views/view.edit.php          |   4 +
 modules/Currencies/Currency.php               |  10 +-
 .../templates/Fields/Forms/enum.tpl           |   6 +-
 .../templates/Fields/TemplateField.php        |   1 +
 modules/EAPM/controller.php                   |   3 +
 modules/EmailMan/EmailMan.php                 |  10 +-
 modules/EmailMan/tpls/config.tpl              |  22 +-
 modules/EmailTemplates/AttachFiles.php        |  25 +-
 modules/EmailTemplates/EmailTemplate.php      | 101 ++-
 .../EmailTemplates/EmailTemplateFormBase.php  |   8 +-
 .../PopupDocumentsCampaignTemplate.html       |   2 +-
 .../PopupDocumentsCampaignTemplate.php        |   4 +-
 modules/Emails/Delete.php                     |   2 +-
 modules/Emails/Email.php                      |  88 ++-
 modules/Emails/EmailUI.php                    |  30 +-
 modules/Emails/EmailUIAjax.php                |  29 +-
 modules/Emails/javascript/EmailUI.js          |  26 +-
 modules/Emails/javascript/EmailUICompose.js   |   4 +-
 modules/Emails/javascript/complexLayout.js    |   6 +-
 .../Emails/javascript/composeEmailTemplate.js |   2 +-
 modules/Employees/Employee.php                |  24 +
 .../Dashlets/ChartsDashlet/ChartsDashlet.php  |   8 +-
 .../iFrameDashlet/iFrameDashlet.meta.php      |   5 +-
 .../Dashlets/iFrameDashlet/iFrameDashlet.php  |  12 +-
 modules/Home/UnifiedSearchAdvanced.php        |   9 +-
 modules/Home/index.php                        |  16 +-
 modules/Home/views/view.list.php              |  18 +
 modules/Import/ImportCacheFiles.php           |   2 +-
 modules/Import/Importer.php                   |  22 +-
 modules/Import/views/view.confirm.php         |  10 +-
 modules/Import/views/view.last.php            |  11 +-
 modules/Import/views/view.step3.php           |   8 +-
 modules/InboundEmail/EditView.php             |   4 +-
 modules/InboundEmail/InboundEmail.php         |  43 +-
 modules/Leads/tpls/ConvertLead.tpl            |   9 +-
 modules/Leads/tpls/ConvertLeadFooter.tpl      |   5 +-
 modules/Leads/tpls/ConvertLeadHeader.tpl      |  33 +-
 modules/Leads/tpls/QuickCreate.tpl            |   4 +-
 modules/Leads/vardefs.php                     |   2 +
 modules/Leads/views/view.convertlead.php      |  54 +-
 modules/MailMerge/Step3.php                   | 101 +--
 modules/MailMerge/Step4.php                   |  10 +-
 modules/MailMerge/index.php                   |   2 +-
 modules/MailMerge/merge_query.php             |  99 +++
 .../MyMeetingsDashlet/MyMeetingsDashlet.php   |  18 +-
 modules/Meetings/Meeting.php                  |  14 +-
 modules/Meetings/MeetingFormBase.php          |   4 +-
 modules/Meetings/duration_dependency.js       |  27 +-
 modules/Meetings/metadata/detailviewdefs.php  |   2 +-
 modules/Meetings/metadata/editviewdefs.php    |   3 +-
 modules/Meetings/metadata/quickcreatedefs.php |   2 +-
 modules/Meetings/vardefs.php                  |   7 +-
 modules/MergeRecords/Step1.html               |   2 +-
 modules/MergeRecords/Step2.php                |   4 +-
 modules/MergeRecords/Step3.html               |   4 +-
 modules/ModuleBuilder/MB/MBModule.php         |   2 +-
 .../ModuleBuilder/Module/DropDownBrowser.php  |  14 +
 .../ModuleBuilder/javascript/SimpleList.js    |   2 +-
 .../ModuleBuilder/parsers/StandardField.php   |  15 +
 .../parsers/views/DashletMetaDataParser.php   |   2 +-
 modules/ModuleBuilder/tpls/editProperty.tpl   |   2 +-
 .../ModuleBuilder/views/view.modulefields.php |  16 +
 modules/ProjectTask/ProjectTask.php           | 222 +++++-
 modules/Prospects/tpls/QuickCreate.tpl        |   4 +-
 modules/Schedulers/Scheduler.php              |  13 +-
 modules/Schedulers/_AddJobsHere.php           |  21 +
 modules/Schedulers/language/en_us.lang.php    |   2 +
 modules/SchedulersJobs/vardefs.php            |  10 +-
 modules/SugarFeed/tpls/AdminSettings.tpl      |   6 +-
 modules/Tasks/Task.php                        |   3 +-
 modules/UpgradeWizard/language/en_us.lang.php |   2 +-
 modules/UpgradeWizard/silentUpgrade.php       |   7 +
 .../UpgradeWizard/silentUpgrade_dce_step1.php |   6 +
 .../UpgradeWizard/silentUpgrade_dce_step2.php |   6 +
 modules/UpgradeWizard/silentUpgrade_step1.php |   6 +
 modules/UpgradeWizard/silentUpgrade_step2.php |   7 +
 modules/UpgradeWizard/systemCheck.php         |   1 +
 modules/UpgradeWizard/uw_utils.php            |  33 +-
 modules/Users/Authenticate.php                |  11 +-
 modules/Users/GeneratePassword.php            | 192 ++---
 modules/Users/LoggedOut.php                   |  53 ++
 modules/Users/LoggedOut.tpl                   |  55 ++
 modules/Users/Login.php                       |  14 +-
 modules/Users/Logout.php                      |   6 +-
 modules/Users/Save.php                        |  64 +-
 modules/Users/User.php                        |   2 +-
 modules/Users/UserViewHelper.php              |  12 +-
 .../AuthenticationController.php              |  22 +-
 .../SAMLAuthenticate/SAMLAuthenticate.php     |  23 +-
 .../SAMLAuthenticate/SAMLAuthenticateUser.php | 137 +++-
 .../authentication/SAMLAuthenticate/index.php |   8 +-
 .../lib/xmlseclibs/xmlseclibs.php             |  20 +-
 .../SAMLAuthenticate/settings.php             |  34 +-
 .../SugarAuthenticate/SugarAuthenticate.php   |   9 +-
 modules/Users/language/en_us.lang.php         |   3 +
 modules/Users/tpls/EditViewFooter.tpl         |   4 +-
 modules/vCals/vCal.php                        |   8 +-
 service/core/SugarWebServiceImpl.php          |   6 +
 service/example/example.html                  |   2 +-
 service/v4/SugarWebServiceImplv4.php          |   3 +
 soap/SoapPortalHelper.php                     |   2 +-
 soap/SoapPortalUsers.php                      |  12 +-
 soap/SoapSugarUsers.php                       |  24 +-
 sugar_version.php                             |   8 +-
 tests/PHPUnit/File/Iterator/Autoload.php      |  75 --
 tests/PHPUnit/File/Iterator/Facade.php        | 157 ----
 tests/PHPUnit/PHP/CodeCoverage/Autoload.php   |  97 ---
 tests/PHPUnit/PHP/CodeCoverage/Exception.php  |  60 --
 .../PHP/CodeCoverage/Report/Factory.php       | 274 -------
 .../PHP/CodeCoverage/Report/HTML/Renderer.php | 239 ------
 .../Report/HTML/Renderer/Dashboard.php        | 236 ------
 .../Report/HTML/Renderer/Directory.php        | 141 ----
 .../Report/HTML/Renderer/File.php             | 634 ----------------
 .../HTML/Renderer/Template/close12_1.gif      | Bin 85 -> 0 bytes
 .../HTML/Renderer/Template/container-min.js   |  19 -
 .../HTML/Renderer/Template/container.css      | 324 --------
 .../Renderer/Template/dashboard.html.dist     | 115 ---
 .../Renderer/Template/directory.html.dist     |  71 --
 .../HTML/Renderer/Template/directory.png      | Bin 581 -> 0 bytes
 .../Template/directory_item.html.dist         |  25 -
 .../HTML/Renderer/Template/file.html.dist     | 120 ---
 .../Report/HTML/Renderer/Template/file.png    | Bin 333 -> 0 bytes
 .../Renderer/Template/file_item.html.dist     |  26 -
 .../Renderer/Template/file_no_yui.html.dist   |  79 --
 .../Report/HTML/Renderer/Template/glass.png   | Bin 167 -> 0 bytes
 .../HTML/Renderer/Template/highcharts.js      | 170 -----
 .../HTML/Renderer/Template/jquery.min.js      |   4 -
 .../Renderer/Template/method_item.html.dist   |  19 -
 .../Report/HTML/Renderer/Template/style.css   | 500 -------------
 .../HTML/Renderer/Template/yahoo-dom-event.js |  14 -
 .../Report/HTML/Renderer/Template/yui_item.js |   5 -
 .../PHPUnit/PHP/CodeCoverage/Report/Node.php  | 332 ---------
 .../CodeCoverage/Report/Node/Directory.php    | 513 -------------
 .../PHP/CodeCoverage/Report/Node/File.php     | 694 ------------------
 .../PHP/CodeCoverage/Report/Node/Iterator.php | 149 ----
 tests/PHPUnit/PHP/CodeCoverage/Report/PHP.php |  75 --
 .../PHPUnit/PHP/CodeCoverage/Report/Text.php  | 286 --------
 tests/PHPUnit/PHP/Timer/Autoload.php          |  75 --
 tests/PHPUnit/PHP/Token/Stream/Autoload.php   | 232 ------
 .../PHPUnit/PHPUnit/Framework/Comparator.php  |  98 ---
 .../PHPUnit/Framework/Comparator/Array.php    | 178 -----
 .../Framework/Comparator/DOMDocument.php      | 115 ---
 .../PHPUnit/Framework/Comparator/Double.php   | 102 ---
 .../Framework/Comparator/Exception.php        |  93 ---
 .../Framework/Comparator/MockObject.php       |  87 ---
 .../PHPUnit/Framework/Comparator/Numeric.php  | 117 ---
 .../PHPUnit/Framework/Comparator/Object.php   | 146 ----
 .../PHPUnit/Framework/Comparator/Resource.php |  98 ---
 .../PHPUnit/Framework/Comparator/Scalar.php   | 137 ----
 .../Framework/Comparator/SplObjectStorage.php | 115 ---
 .../PHPUnit/Framework/Comparator/Type.php     | 106 ---
 .../PHPUnit/Framework/ComparatorFactory.php   | 156 ----
 .../Framework/Constraint/Composite.php        | 115 ---
 .../PHPUnit/Framework/Constraint/Count.php    | 129 ----
 .../PHPUnit/Framework/Constraint/SameSize.php |  74 --
 .../PHPUnit/Framework/Error/Deprecated.php    |  66 --
 .../PHPUnit/Framework/MockObject/Autoload.php | 111 ---
 .../MockObject/Generator/trait_class.tpl.dist |   4 -
 .../Framework/MockObject/Stub/ReturnSelf.php  |  76 --
 .../MockObject/Stub/ReturnValueMap.php        |  87 ---
 .../PHPUnit/PHPUnit/Framework/OutputError.php |  61 --
 tests/PHPUnit/PHPUnit/Util/String.php         | 119 ---
 tests/SugarTestHelper.php                     | 353 +++++++++
 tests/data/Bug52133Test.php                   | 109 +++
 tests/data/Bug53223Test.php                   | 203 +++++
 tests/data/Bug53963Test.php                   |  84 +++
 tests/data/GetLinkedBeansTest.php             |   8 +
 tests/data/Relationships/Bug52544Test.php     |  73 ++
 tests/data/SugarBeanTest.php                  |  27 +
 .../MVC/Controller/SugarControllerTest.php    |   2 +-
 .../MVC/View/views/ViewNoAccessTest.php       |  12 +-
 .../include/MVC/View/views/ViewVcardTest.php  |  13 +-
 tests/include/SerializeEvilTest.php           |   1 +
 .../Smarty/plugins/FunctionSugarHelpTest.php  |   8 +-
 tests/include/database/Bug52783Test.php       | 109 +++
 tests/include/database/Bug53002Test.php       |  66 ++
 tests/include/database/DBManagerTest.php      |  21 +-
 tests/include/utils/Bug33284_Test.php         |   6 +-
 tests/include/utils/CleanDirNameTest.php      |  54 ++
 tests/metadata/Bug51105Test.php               |  68 ++
 .../Administration/SugarSpriteBuilderTest.php |   4 +
 .../modules/Configurator/ConfiguratorTest.php |   2 +-
 tests/modules/DynamicFields/Bug51427Test.php  | 254 +++++++
 .../templates/Fields/Bug52610Test.php         |  81 ++
 .../Emails/BugNullAssignedUserIdTest.php      |  95 +++
 tests/modules/InboundEmail/Bug43554Test.php   |  27 +-
 tests/modules/Leads/Bug44522Test.php          |   5 +-
 tests/modules/Leads/ConvertLeadTests.php      |  74 +-
 tests/modules/MassUpdate/Bug51596Test.php     | 108 +--
 tests/modules/ModuleBuilder/Bug52063Test.php  |   4 +-
 .../modules/ModuleBuilder/MB/Bug40299Test.php |  65 ++
 tests/modules/Project/Bug37123Test.php        |  14 +-
 tests/modules/Reports/Bug36246Test.php        |   2 +-
 .../SchedulersJobs/SchedulersJobsTest.php     |  40 +
 tests/modules/UpgradeWizard/Bug46028Test.php  |   5 +
 .../SAMLAuthenticate/Bug49069Test.php         |  11 +-
 .../SAMLAuthenticate/Bug49959Test.php         | 190 +++++
 .../SAMLAuthenticate/Bug50936Test.php         |  11 +-
 tests/service/Bug42683Test.php                |  27 +-
 tests/service/Bug51723Test.php                | 135 ++++
 tests/soap/Bug41392Test.php                   |   2 +-
 tests/soap/Bug43339Test.php                   | 165 +++++
 themes/Sugar5/css/style.css                   |  43 +-
 364 files changed, 6271 insertions(+), 9972 deletions(-)
 create mode 100644 include/connectors/utils/ConnectorHtmlHelper.php
 create mode 100644 include/connectors/utils/ConnectorHtmlHelperFactory.php
 create mode 100644 modules/MailMerge/merge_query.php
 create mode 100644 modules/Users/LoggedOut.php
 create mode 100644 modules/Users/LoggedOut.tpl
 delete mode 100755 tests/PHPUnit/File/Iterator/Autoload.php
 delete mode 100755 tests/PHPUnit/File/Iterator/Facade.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Autoload.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Exception.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Factory.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/File.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/close12_1.gif
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container-min.js
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container.css
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.png
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.png
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/glass.png
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/jquery.min.js
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/style.css
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yahoo-dom-event.js
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yui_item.js
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Node.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Node/Directory.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Node/File.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Node/Iterator.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/PHP.php
 delete mode 100755 tests/PHPUnit/PHP/CodeCoverage/Report/Text.php
 delete mode 100755 tests/PHPUnit/PHP/Timer/Autoload.php
 delete mode 100755 tests/PHPUnit/PHP/Token/Stream/Autoload.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Array.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/DOMDocument.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Double.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Exception.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/MockObject.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Numeric.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Object.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Resource.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Scalar.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/SplObjectStorage.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Comparator/Type.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/ComparatorFactory.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Constraint/Composite.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Constraint/Count.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Constraint/SameSize.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/Error/Deprecated.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/MockObject/Autoload.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Framework/OutputError.php
 delete mode 100755 tests/PHPUnit/PHPUnit/Util/String.php
 create mode 100755 tests/data/Bug52133Test.php
 create mode 100755 tests/data/Bug53223Test.php
 create mode 100755 tests/data/Bug53963Test.php
 create mode 100755 tests/data/Relationships/Bug52544Test.php
 create mode 100755 tests/include/database/Bug52783Test.php
 create mode 100755 tests/include/database/Bug53002Test.php
 create mode 100755 tests/include/utils/CleanDirNameTest.php
 create mode 100755 tests/metadata/Bug51105Test.php
 create mode 100755 tests/modules/DynamicFields/Bug51427Test.php
 create mode 100755 tests/modules/DynamicFields/templates/Fields/Bug52610Test.php
 create mode 100755 tests/modules/Emails/BugNullAssignedUserIdTest.php
 create mode 100755 tests/modules/ModuleBuilder/MB/Bug40299Test.php
 create mode 100755 tests/modules/Users/authentication/SAMLAuthenticate/Bug49959Test.php
 create mode 100755 tests/service/Bug51723Test.php
 create mode 100755 tests/soap/Bug43339Test.php

diff --git a/ModuleInstall/ModuleInstaller.php b/ModuleInstall/ModuleInstaller.php
index b1ab2375..7f7fd346 100644
--- a/ModuleInstall/ModuleInstaller.php
+++ b/ModuleInstall/ModuleInstaller.php
@@ -534,7 +534,155 @@ class ModuleInstaller{
 		}
     }
 
-	public function install_extensions()
+    /**
+     * Method removes module from global search configurations
+     *
+     * return bool
+     */
+    public function uninstall_global_search()
+    {
+        if (empty($this->installdefs['beans']))
+        {
+            return true;
+        }
+
+        if (is_file('custom/modules/unified_search_modules_display.php') == false)
+        {
+            return true;
+        }
+
+        $user = new User();
+        $users = get_user_array();
+        $unified_search_modules_display = array();
+        require('custom/modules/unified_search_modules_display.php');
+
+        foreach($this->installdefs['beans'] as $beanDefs)
+        {
+            if (array_key_exists($beanDefs['module'], $unified_search_modules_display) == false)
+            {
+                continue;
+            }
+            unset($unified_search_modules_display[$beanDefs['module']]);
+            foreach($users as $userId => $userName)
+            {
+                if (empty($userId))
+                {
+                    continue;
+                }
+                $user->retrieve($userId);
+                $prefs = $user->getPreference('globalSearch', 'search');
+                if (array_key_exists($beanDefs['module'], $prefs) == false)
+                {
+                    continue;
+                }
+                unset($prefs[$beanDefs['module']]);
+                $user->setPreference('globalSearch', $prefs, 0, 'search');
+                $user->savePreferencesToDB();
+            }
+        }
+
+        if (write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php') == false)
+        {
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Method enables module in global search configurations by disabled_module_visible key
+     *
+     * return bool
+     */
+    public function enable_global_search()
+    {
+        if (empty($this->installdefs['beans']))
+        {
+            return true;
+        }
+
+        if (is_file('custom/modules/unified_search_modules_display.php') == false)
+        {
+            return true;
+        }
+
+        $unified_search_modules_display = array();
+        require('custom/modules/unified_search_modules_display.php');
+
+        foreach($this->installdefs['beans'] as $beanDefs)
+        {
+            if (array_key_exists($beanDefs['module'], $unified_search_modules_display) == false)
+            {
+                continue;
+            }
+            if (isset($unified_search_modules_display[$beanDefs['module']]['disabled_module_visible']) == false)
+            {
+                continue;
+            }
+            $unified_search_modules_display[$beanDefs['module']]['visible'] = $unified_search_modules_display[$beanDefs['module']]['disabled_module_visible'];
+            unset($unified_search_modules_display[$beanDefs['module']]['disabled_module_visible']);
+        }
+
+        if (write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php') == false)
+        {
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Method disables module in global search configurations by disabled_module_visible key
+     *
+     * return bool
+     */
+    public function disable_global_search()
+    {
+        if (empty($this->installdefs['beans']))
+        {
+            return true;
+        }
+
+        if (is_file('custom/modules/unified_search_modules_display.php') == false)
+        {
+            return true;
+        }
+
+        $unified_search_modules_display = array();
+        require('custom/modules/unified_search_modules_display.php');
+
+        foreach($this->installdefs['beans'] as $beanDefs)
+        {
+            if (array_key_exists($beanDefs['module'], $unified_search_modules_display) == false)
+            {
+                continue;
+            }
+            if (isset($unified_search_modules_display[$beanDefs['module']]['visible']) == false)
+            {
+                continue;
+            }
+            $unified_search_modules_display[$beanDefs['module']]['disabled_module_visible'] = $unified_search_modules_display[$beanDefs['module']]['visible'];
+            $unified_search_modules_display[$beanDefs['module']]['visible'] = false;
+        }
+
+        if (write_array_to_file("unified_search_modules_display", $unified_search_modules_display, 'custom/modules/unified_search_modules_display.php') == false)
+        {
+            global $app_strings;
+            $msg = string_format($app_strings['ERR_FILE_WRITE'], array('custom/modules/unified_search_modules_display.php'));
+            $GLOBALS['log']->error($msg);
+            throw new Exception($msg);
+            return false;
+        }
+        return true;
+    }
+
+    public function install_extensions()
 	{
 	    foreach($this->extensions as $extname => $ext) {
 	        $install = "install_$extname";
@@ -1328,6 +1476,7 @@ class ModuleInstaller{
 			'uninstall_connectors',
 			'uninstall_layoutfields',
 		    'uninstall_extensions',
+            'uninstall_global_search',
 			'disable_manifest_logichooks',
 			'post_uninstall',
 		);
@@ -1883,6 +2032,7 @@ private function dir_file_count($path){
 								'enable_dashlets',
 								'enable_relationships',
 		                        'enable_extensions',
+                                'enable_global_search',
 		                        'enable_manifest_logichooks',
 								'reset_opcodes',
 		);
@@ -1952,6 +2102,7 @@ private function dir_file_count($path){
 							'disable_dashlets',
 							'disable_relationships',
 		                    'disable_extensions',
+                            'disable_global_search',
 							'disable_manifest_logichooks',
 							'reset_opcodes',
 							);
diff --git a/ModuleInstall/PackageManager/PackageManager.php b/ModuleInstall/PackageManager/PackageManager.php
index 9316f5b3..186a15b6 100644
--- a/ModuleInstall/PackageManager/PackageManager.php
+++ b/ModuleInstall/PackageManager/PackageManager.php
@@ -569,21 +569,25 @@ class PackageManager{
     	$uh->id_name = $name;
     	$found = $uh->checkForExisting($uh);
     	if($found != null){
-
     		global $sugar_config;
 	        global $mod_strings;
 	        global $current_language;
 	        $base_upgrade_dir       = $this->upload_dir.'/upgrades';
 	        $base_tmp_upgrade_dir   = "$base_upgrade_dir/temp";
-	    	if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
-	    	$unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
-	    	unzip($found->filename, $unzip_dir );
-	    	$mi = new ModuleInstaller();
-	        $mi->silent = true;
-	        $mi->uninstall( "$unzip_dir");
-	        $found->delete();
-	        unlink(remove_file_extension( $found->filename ) . '-manifest.php');
-	        unlink($found->filename);
+            if(is_file($found->filename)){
+                if(!isset($GLOBALS['mi_remove_tables']))$GLOBALS['mi_remove_tables'] = true;
+                $unzip_dir = mk_temp_dir( $base_tmp_upgrade_dir );
+                unzip($found->filename, $unzip_dir );
+                $mi = new ModuleInstaller();
+                $mi->silent = true;
+                $mi->uninstall( "$unzip_dir");
+                $found->delete();
+                unlink(remove_file_extension( $found->filename ) . '-manifest.php');
+                unlink($found->filename);
+            }else{
+                //file(s_ have been deleted or are not found in the directory, allow database delete to happen but no need to change filesystem
+                $found->delete();
+            }
     	}
     }
 
diff --git a/ModuleInstall/PackageManager/PackageManagerDisplay.php b/ModuleInstall/PackageManager/PackageManagerDisplay.php
index 85241420..e9072fd5 100644
--- a/ModuleInstall/PackageManager/PackageManagerDisplay.php
+++ b/ModuleInstall/PackageManager/PackageManagerDisplay.php
@@ -62,6 +62,7 @@ class PackageManagerDisplay{
         global $sugar_version, $sugar_config;
         $app_strings = return_application_language($current_language);
         $ss = new Sugar_Smarty();
+        $ss->assign('APP_STRINGS', $app_strings);
         $ss->assign('FORM_1_PLACE_HOLDER', $form1);
         $ss->assign('form_action', $form_action);
         $ss->assign('hidden_fields', $hidden_fields);
@@ -116,7 +117,14 @@ class PackageManagerDisplay{
 
         $ss->assign('MOD', $mod_strings);
 		$ss->assign('module_load', 'true');
-        $ss->assign('scripts', PackageManagerDisplay::getDisplayScript($install));
+        if (UploadStream::getSuhosinStatus() == false)
+        {
+            $ss->assign('ERR_SUHOSIN', true);
+        }
+        else
+        {
+            $ss->assign('scripts', PackageManagerDisplay::getDisplayScript($install));
+        }
         $show_login = false; //hiding install from sugar
 		$ss->assign('MODULE_SELECTOR', PackageManagerDisplay::buildGridOutput($tree, $mod_strings, $isAlive, $show_login));
        $ss->assign('FORM_2_PLACE_HOLDER', $form2);
@@ -608,4 +616,3 @@ class PackageManagerDisplay{
 		}
     }
  }
-?>
diff --git a/ModuleInstall/PackageManager/tpls/PackageForm.tpl b/ModuleInstall/PackageManager/tpls/PackageForm.tpl
index fac4b8da..96a913d0 100644
--- a/ModuleInstall/PackageManager/tpls/PackageForm.tpl
+++ b/ModuleInstall/PackageManager/tpls/PackageForm.tpl
@@ -35,6 +35,9 @@
  ********************************************************************************/
 
  *}
+{if $ERR_SUHOSIN == true}
+{$APP_STRINGS.ERR_SUHOSIN}
+{else}
 {$scripts}
 {$TREEHEADER}
 {literal}
@@ -101,6 +104,4 @@ pre {
 </script>
 {/literal}
 {/if}
-
-
-
+{/if}
diff --git a/Zend/Oauth/Provider.php b/Zend/Oauth/Provider.php
index 9105d8bf..220db809 100644
--- a/Zend/Oauth/Provider.php
+++ b/Zend/Oauth/Provider.php
@@ -256,7 +256,7 @@ class Zend_Oauth_Provider
 	    if(empty($_SERVER['SERVER_PORT']) || empty($_SERVER['HTTP_HOST']) || empty($_SERVER['REQUEST_URI'])) {
 	        return Zend_Uri_Http::fromString("http://localhost/");
 	    }
-	    if($_SERVER['SERVER_PORT'] == 443 || (!empty($_SERVER['HTTPS']) &&  $_SERVER['HTTPS'] == 'on')) {
+	    if($_SERVER['SERVER_PORT'] == 443 || (!empty($_SERVER['HTTPS']) &&  $_SERVER['HTTPS'] == 'on') || (!empty($_SERVER['HTTP_HTTPS']) &&  $_SERVER['HTTP_HTTPS'] == 'on')) {
 	        $proto = 'https';
 	    }
 	    return Zend_Uri_Http::fromString("$proto://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}");
diff --git a/cache/include/javascript/sugar_field_grp.js b/cache/include/javascript/sugar_field_grp.js
index 5a9ee496..a37a25a8 100644
--- a/cache/include/javascript/sugar_field_grp.js
+++ b/cache/include/javascript/sugar_field_grp.js
@@ -51,10 +51,10 @@ function Datetimecombo(datetime,field,timeformat,tabindex,showCheckbox,checked,a
 this.fieldname=field;if(datetime!='')
 {parts=datetime.split(' ');this.hrs=parseInt(parts[1].substring(0,2),10);this.mins=parseInt(parts[1].substring(3,5),10);}
 this.timeformat=timeformat;this.tabindex=tabindex==null||isNaN(tabindex)?1:tabindex;this.timeseparator=this.timeformat.substring(2,3);this.has12Hours=/^11/.test(this.timeformat);this.hasMeridiem=/am|pm/i.test(this.timeformat);if(this.hasMeridiem){this.pm=/pm/.test(this.timeformat);}
-this.meridiem=this.hasMeridiem?trim(this.datetime.substring(16)):'';this.datetime=this.datetime.substr(0,10);this.showCheckbox=showCheckbox;this.checked=parseInt(checked);document.getElementById(this.fieldname+'_date').value=this.datetime;if(this.mins>0&&this.mins<15){this.mins=15;}else if(this.mins>15&&this.mins<30){this.mins=30;}else if(this.mins>30&&this.mins<45){this.mins=45;}else if(this.mins>45){this.hrs+=1;this.mins=0;if(this.hasMeridiem&&this.hrs==12){if(this.meridiem=="pm"||this.meridiem=="am"){if(this.meridiem=="pm"){this.meridiem="am";}else{this.meridiem="pm";}}else{if(this.meridiem=="PM"){this.meridiem="AM";}else{this.meridiem="PM";}}}
+this.meridiem=this.hasMeridiem?trim(this.datetime.substring(16)):'';this.datetime=this.datetime.substr(0,10);this.showCheckbox=showCheckbox;this.checked=parseInt(checked);YAHOO.util.Selector.query('input#'+this.fieldname+'_date')[0].value=this.datetime;if(this.mins>0&&this.mins<15){this.mins=15;}else if(this.mins>15&&this.mins<30){this.mins=30;}else if(this.mins>30&&this.mins<45){this.mins=45;}else if(this.mins>45){this.hrs+=1;this.mins=0;if(this.hasMeridiem&&this.hrs==12){if(this.meridiem=="pm"||this.meridiem=="am"){if(this.meridiem=="pm"){this.meridiem="am";}else{this.meridiem="pm";}}else{if(this.meridiem=="PM"){this.meridiem="AM";}else{this.meridiem="PM";}}}
 if(this.hasMeridiem&&this.hrs>12){this.hrs=this.hrs-12;}}}
-Datetimecombo.prototype.jsscript=function(callback){text='\nfunction update_'+this.fieldname+'(calendar) {';text+='\nd = document.getElementById("'+this.fieldname+'_date").value;';text+='\nh = document.getElementById("'+this.fieldname+'_hours").value;';text+='\nm = document.getElementById("'+this.fieldname+'_minutes").value;';text+='\nnewdate = d + " " + h + "'+this.timeseparator+'" + m;';if(this.hasMeridiem){text+='\nif(typeof document.getElementById("'+this.fieldname+'_meridiem") != "undefined") {';text+='\n   newdate += document.getElementById("'+this.fieldname+'_meridiem").value;';text+='\n}';}
-text+='\nif(trim(newdate) =="'+this.timeseparator+'") newdate="";';text+='\ndocument.getElementById("'+this.fieldname+'").value = newdate;';text+='\n'+callback;text+='\n}';return text;}
+Datetimecombo.prototype.jsscript=function(callback){text='\nfunction update_'+this.fieldname+'(calendar) {';text+='\nd = YAHOO.util.Selector.query("input#'+this.fieldname+'_date")[0].value;';text+='\nh = YAHOO.util.Selector.query("select#'+this.fieldname+'_hours")[0].value;';text+='\nm = YAHOO.util.Selector.query("select#'+this.fieldname+'_minutes")[0].value;';text+='\nnewdate = d + " " + h + "'+this.timeseparator+'" + m;';if(this.hasMeridiem){text+='\nif(typeof YAHOO.util.Selector.query("select#'+this.fieldname+'_meridiem")[0] != "undefined") {';text+='\n   newdate += YAHOO.util.Selector.query("select#'+this.fieldname+'_meridiem")[0].value;';text+='\n}';}
+text+='\nif(trim(newdate) =="'+this.timeseparator+'") newdate="";';text+='\nYAHOO.util.Selector.query("select#'+this.fieldname+'")[0].value = newdate;';text+='\n'+callback;text+='\n}';return text;}
 Datetimecombo.prototype.html=function(callback){var text='<span style="position:relative; top:6px;"><select class="datetimecombo_time" size="1" id="'+this.fieldname+'_hours" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'">';var h1=this.has12Hours?1:0;var h2=this.has12Hours?12:23;if(this.allowEmptyHM){text+='<option></option>';}
 for(i=h1;i<=h2;i++){val=i<10?"0"+i:i;text+='<option value="'+val+'" '+(i==this.hrs?"SELECTED":"")+'>'+val+'</option>';}
 text+='\n</select>&nbsp;';text+=this.timeseparator;text+='\n&nbsp;<select class="datetimecombo_time" size="1" id="'+this.fieldname+'_minutes" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'">';if(this.allowEmptyHM){text+='\n<option></option>';}
@@ -62,9 +62,12 @@ text+='\n<option value="00" '+(this.mins==0?"SELECTED":"")+'>00</option>';text+=
 text+='\n<option value="'+(this.pm?"am":"AM")+'" '+(/am/i.test(this.meridiem)?"SELECTED":"")+'>'+(this.pm?"am":"AM")+'</option>';text+='\n<option value="'+(this.pm?"pm":"PM")+'" '+(/pm/i.test(this.meridiem)?"SELECTED":"")+'>'+(this.pm?"pm":"PM")+'</option>';text+='\n</select>';}
 if(this.showCheckbox){text+='\n<input style="visibility:hidden;" type="checkbox" name="'+this.fieldname+'_flag" id="'+this.fieldname+'_flag" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'" '+(this.checked?'CHECKED':'')+'>';}
 text+='</span>';return text;};Datetimecombo.prototype.update=function(updateListeners){if(typeof(updateListeners)=="undefined")
-updateListeners=true;var d=window.document.getElementById(this.fieldname+'_date');var h=window.document.getElementById(this.fieldname+'_hours');var m=window.document.getElementById(this.fieldname+'_minutes');var mer=document.getElementById(this.fieldname+"_meridiem");if(d.value==""){h.selectedIndex=0;m.selectedIndex=0;if(mer)mer.selectedIndex=0;}else{if(this.allowEmptyHM){if(h.selectedIndex==0)h.selectedIndex=12;if(m.selectedIndex==0)m.selectedIndex=1;if(mer&&(mer.selectedIndex==0))mer.selectedIndex=1;}}
-var newdate=d.value+' '+h.value+this.timeseparator+m.value;if(this.hasMeridiem){ampm=document.getElementById(this.fieldname+"_meridiem").value;newdate+=ampm;}
+updateListeners=true;var d=YAHOO.util.Selector.query('input#'+this.fieldname+'_date')[0];var h=YAHOO.util.Selector.query('select#'+this.fieldname+'_hours')[0];var m=YAHOO.util.Selector.query('select#'+this.fieldname+'_minutes')[0];var mer=YAHOO.util.Selector.query('select#'+this.fieldname+"_meridiem")[0];if(d.value==""){h.selectedIndex=0;m.selectedIndex=0;if(mer)mer.selectedIndex=0;}else{if(this.allowEmptyHM){if(h.selectedIndex==0)h.selectedIndex=12;if(m.selectedIndex==0)m.selectedIndex=1;if(mer&&(mer.selectedIndex==0))mer.selectedIndex=1;}}
+var newdate=d.value+' '+h.value+this.timeseparator+m.value;if(this.hasMeridiem){ampm=YAHOO.util.Selector.query('select#'+this.fieldname+"_meridiem")[0].value;newdate+=ampm;}
 if(trim(newdate)==""+this.timeseparator+""){newdate='';}
-document.getElementById(this.fieldname).value=newdate;if(updateListeners)
-SUGAR.util.callOnChangeListers(this.fieldname);if(this.showCheckbox){flag=this.fieldname+'_flag';date=this.fieldname+'_date';hours=this.fieldname+'_hours';mins=this.fieldname+'_minutes';if(document.getElementById(flag).checked){document.getElementById(flag).value=1;document.getElementById(this.fieldname).value='';document.getElementById(date).disabled=true;document.getElementById(hours).disabled=true;document.getElementById(mins).disabled=true;}else{document.getElementById(flag).value=0;document.getElementById(date).disabled=false;document.getElementById(hours).disabled=false;document.getElementById(mins).disabled=false;}}};/* End of File include/SugarFields/Fields/Datetimecombo/Datetimecombo.js */
+YAHOO.util.Selector.query('input#'+this.fieldname)[0].value=newdate;if(updateListeners)
+SUGAR.util.callOnChangeListers(this.fieldname);if(this.showCheckbox){flag=this.fieldname+'_flag';date=this.fieldname+'_date';hours=this.fieldname+'_hours';mins=this.fieldname+'_minutes';if(YAHOO.util.Selector.query('input#'+flag)[0].checked)
+{YAHOO.util.Selector.query('input#'+flag)[0].value=1;YAHOO.util.Selector.query('input#'+this.fieldname)[0].value='';YAHOO.util.Selector.query('input#'+date)[0].disabled=true;YAHOO.util.Selector.query('select#'+hours)[0].disabled=true;YAHOO.util.Selector.query('select#'+mins)[0].disabled=true;}
+else
+{YAHOO.util.Selector.query('input#'+flag)[0].value=0;YAHOO.util.Selector.query('input#'+date)[0].disabled=false;YAHOO.util.Selector.query('select#'+hours)[0].disabled=false;YAHOO.util.Selector.query('select#'+mins)[0].disabled=false;}}};/* End of File include/SugarFields/Fields/Datetimecombo/Datetimecombo.js */
 
diff --git a/cache/include/javascript/sugar_grp1.js b/cache/include/javascript/sugar_grp1.js
index f5f933cc..acc40550 100644
--- a/cache/include/javascript/sugar_grp1.js
+++ b/cache/include/javascript/sugar_grp1.js
@@ -191,7 +191,7 @@ else if(document.documentElement&&document.documentElement.scrollTop)
 {nwX=document.documentElement.scrollLeft;seX=document.documentElement.clientWidth;nwY=document.documentElement.scrollTop;seY=document.documentElement.clientHeight;}
 else if(document.body)
 {nwX=document.body.scrollLeft;seX=document.body.clientWidth;nwY=document.body.scrollTop;seY=document.body.clientHeight;}
-var inView=true;for(var wp=0;wp<inputsWithErrors.length;wp++){var elementCoor=findElementPos(inputsWithErrors[wp]);if(!(elementCoor.x>=nwX&&elementCoor.y>=nwY&&elementCoor.x<=seX&&elementCoor.y<=seY)){inView=false;scrollToTop=elementCoor.y-75;scrollToLeft=elementCoor.x-75;}
+var inView=true;for(var wp=0;wp<inputsWithErrors.length;wp++){var elementCoor=findElementPos(inputsWithErrors[wp]);if(!(elementCoor.x>=nwX&&elementCoor.y>=nwY&&elementCoor.x<=seX+nwX&&elementCoor.y<=seY+nwY)){inView=false;scrollToTop=elementCoor.y-75;scrollToLeft=elementCoor.x-75;}
 else{break;}}
 if(!inView)window.scrollTo(scrollToLeft,scrollToTop);return false;}
 disableOnUnloadEditView(form);return true;}
@@ -479,6 +479,7 @@ selectedIndex=nodeCount;}}
 document.getElementById('orderBySelect').selectedIndex=selectedIndex;};SUGAR.tabChooser.movementCallback(document.getElementById('display_tabs_td').getElementsByTagName('select')[0]);if(document.search_form.orderBy)
 document.search_form.orderBy.options.value=SUGAR.savedViews.selectedOrderBy;if(SUGAR.savedViews.selectedSortOrder=='DESC')document.getElementById('sort_order_desc_radio').checked=true;else document.getElementById('sort_order_asc_radio').checked=true;}};}();SUGAR.searchForm=function(){var url;return{searchFormSelect:function(view,previousView){var module=view.split('|')[0];var theView=view.split('|')[1];var handleDisplay=function(){document.search_form.searchFormTab.value=theView;patt=module+"(.*)SearchForm$";divId=document.search_form.getElementsByTagName('div');for(i=0;i<divId.length;i++){if(divId[i].id.match(module)==module){if(divId[i].id.match('SearchForm')=='SearchForm'){if(document.getElementById(divId[i].id).style.display==''){previousTab=divId[i].id.match(patt)[1];}
 document.getElementById(divId[i].id).style.display='none';}}}
+adv=document.getElementById('advanced_search_link');bas=document.getElementById('basic_search_link');adv.setAttribute('accesskey','');bas.setAttribute('accesskey','');a_key=SUGAR.language.get("app_strings","LBL_ADV_SEARCH_LNK_KEY");if(theView==='advanced_search'){bas.setAttribute('accesskey',a_key);}else{adv.setAttribute('accesskey',a_key);}
 document.getElementById(module+theView+'SearchForm').style.display='';if(previousView){thepreviousView=previousView.split('|')[1];}
 else{thepreviousView=previousTab;}
 thepreviousView=thepreviousView.replace(/_search/,"");for(num in document.search_form.elements){if(document.search_form.elements[num]){el=document.search_form.elements[num];pattern="^(.*)_"+thepreviousView+"$";if(typeof el.type!='undefined'&&typeof el.name!='undefined'&&el.name.match(pattern)){advanced_input_name=el.name.match(pattern)[1];advanced_input_name=advanced_input_name+"_"+theView.replace(/_search/,"");if(typeof document.search_form[advanced_input_name]!='undefined')
@@ -492,7 +493,8 @@ else{handleDisplay();}},copyElement:function(inputName,copyFromElement){switch(c
 if(typeof(elem.type)!='undefined'&&typeof(skipElementNames)!='undefined'&&SUGAR.util.arrayIndexOf(skipElementNames,elem.name)!=-1)
 {continue;}
 elemType=elem.type.toLowerCase();if(elemType=='text'||elemType=='textarea'||elemType=='password'){elem.value='';}
-else if(elemType=='select'||elemType=='select-one'||elemType=='select-multiple'){var optionList=elem.options;for(var ii=0;ii<optionList.length;ii++){optionList[ii].selected=false;}}
+else if(elemType=='select'||elemType=='select-one'||elemType=='select-multiple'){var optionList=elem.options;if(optionList.length>0){optionList[0].selected="selected";}
+for(var ii=0;ii<optionList.length;ii++){optionList[ii].selected=false;}}
 else if(elemType=='radio'||elemType=='checkbox'){elem.checked=false;elem.selected=false;}
 else if(elemType=='hidden'){if((elem.name.length>3&&elem.name.substring(elem.name.length-3)=='_id')||((elem.name.length>9)&&(elem.name.substring(elem.name.length-9)=='_id_basic'))||(elem.name.length>12&&elem.name.substring(elem.name.length-12)=='_id_advanced')||(elem.name.length>2&&elem.name.substring(elem.name.length-2)=='_c')||((elem.name.length>8)&&(elem.name.substring(elem.name.length-8)=='_c_basic'))||(elem.name.length>11&&elem.name.substring(elem.name.length-11)=='_c_advanced'))
 {elem.value='';}}}
@@ -563,11 +565,11 @@ popupCount=1;window.document.popup_request_data=popup_request_data;window.docume
 popupCount++;if(hide_clear_button){URL+='&hide_clear_button=true';}
 windowFeatures='width='+width
 +',height='+height
-+',resizable=1,scrollbars=1';if(popup_mode==''&&popup_mode=='undefined'){popup_mode='single';}
-URL+='&mode='+popup_mode;if(create==''&&create=='undefined'){create='false';}
-URL+='&create='+create;if(metadata!=''&&metadata!='undefined'){URL+='&metadata='+metadata;}
++',resizable=1,scrollbars=1';if(popup_mode==''||popup_mode==undefined){popup_mode='single';}
+URL+='&mode='+popup_mode;if(create==''||create==undefined){create='false';}
+URL+='&create='+create;if(metadata!=''&&metadata!=undefined){URL+='&metadata='+metadata;}
 if(popup_request_data.jsonObject){var request_data=popup_request_data.jsonObject;}else{var request_data=popup_request_data;}
-var field_to_name_array_url='';if(request_data&&request_data.field_to_name_array!='undefined'){for(var key in request_data.field_to_name_array){if(key.toLowerCase()!='id'){field_to_name_array_url+='&field_to_name[]='+encodeURIComponent(key.toLowerCase());}}}
+var field_to_name_array_url='';if(request_data&&request_data.field_to_name_array!=undefined){for(var key in request_data.field_to_name_array){if(key.toLowerCase()!='id'){field_to_name_array_url+='&field_to_name[]='+encodeURIComponent(key.toLowerCase());}}}
 if(field_to_name_array_url){URL+=field_to_name_array_url;}
 win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus)
 {win.focus();}
@@ -682,7 +684,9 @@ else{SUGAR.ajaxUI.showLoadingPanel();ui.lastCall=YAHOO.util.Connect.asyncRequest
 SA.cleanGlobals();var form=YAHOO.util.Dom.get(formname)||document.forms[formname];if(SA.canAjaxLoadModule(form.module.value)&&typeof(YAHOO.util.Selector.query("input[type=file]",form)[0])=="undefined"&&/action=ajaxui/.exec(window.location))
 {var string=con.setForm(form);var baseUrl="index.php?action=ajaxui#ajaxUILoc=";SA.lastURL="";if(string.length>200)
 {SUGAR.ajaxUI.showLoadingPanel();form.onsubmit=function(){return true;};form.submit();}else{con.resetFormState();window.location=baseUrl+encodeURIComponent("index.php?"+string);}
-return true;}else{form.submit();return false;}},cleanGlobals:function()
+return true;}else{if(typeof(YAHOO.util.Selector.query("input[type=submit]",form)[0])!="undefined"&&YAHOO.util.Selector.query("input[type=submit]",form)[0].value=="Save")
+{ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_SAVING'));}
+form.submit();return false;}},cleanGlobals:function()
 {sqs_objects={};QSProcessedFieldsArray={};collection={};if(SUGAR.EmailAddressWidget){SUGAR.EmailAddressWidget.instances={};SUGAR.EmailAddressWidget.count={};}
 YAHOO.util.Event.removeListener(window,'resize');if(typeof(dialog)!='undefined'&&typeof(dialog.destroy)=='function'){dialog.destroy();delete dialog;}},firstLoad:function()
 {var url=YAHOO.util.History.getBookmarkedState('ajaxUILoc');var aRegex=/action=([^&#]*)/.exec(window.location);var action=aRegex?aRegex[1]:false;var mRegex=/module=([^&#]*)/.exec(window.location);var module=mRegex?mRegex[1]:false;if(module!="ModuleBuilder")
@@ -850,7 +854,7 @@ var theme=SUGAR.themes.theme_name;var idx=0;if(!SE.composeLayout.composeTemplate
 SE.composeLayout.composeTemplate=new YAHOO.SUGAR.Template(SE.templates['compose']);var panel_modal=dce_mode?false:true,panel_width='880px',panel_constrain=dce_mode?false:true,panel_height=dce_mode?'auto':'400px',panel_shadow=dce_mode?false:true,panel_draggable=dce_mode?false:true,panel_resize=dce_mode?false:true,panel_close=dce_mode?false:true;SQ.parentPanel=new YAHOO.widget.Panel("container1",{modal:panel_modal,visible:true,constraintoviewport:panel_constrain,width:panel_width,height:panel_height,shadow:panel_shadow,draggable:panel_draggable,resize:panel_resize,close:panel_close});if(!dce_mode){SQ.parentPanel.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_QUICK_COMPOSE'));}
 SQ.parentPanel.setBody("<div class='email'><div id='htmleditordiv"+idx+"'></div></div>");var composePanel=SE.composeLayout.getQuickComposeLayout(SQ.parentPanel,this.options);if(!dce_mode){var resize=new YAHOO.util.Resize('container1',{handles:['br'],autoRatio:false,minWidth:400,minHeight:350,status:false});resize.on('resize',function(args){var panelHeight=args.height;this.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight-50);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);},SQ.parentPanel,true);}else{SUGAR.util.doWhen("typeof SE.composeLayout[SE.composeLayout.currentInstanceId] != 'undefined'",function(){var panelHeight=400;SQ.parentPanel.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);});}
 YAHOO.util.Dom.setStyle("container1","z-index",1);if(!SQ.tinyLoaded)
-{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true});SQ.tinyLoaded=true;}
+{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true});SQ.tinyLoaded=true;}
 SQ.parentPanel.show();SUGAR.email2.composeLayout.forceCloseCompose=function(o){SUGAR.quickCompose.parentPanel.hide();}
 if(!dce_mode){SQ.parentPanel.center();}},init:function(o){if(typeof o.menu_id!='undefined'){this.dceMenuPanel=o.menu_id;}else{this.dceMenuPanel=null;}
 loadingMessgPanl=new YAHOO.widget.SimpleDialog('loading',{width:'200px',close:true,modal:true,visible:true,fixedcenter:true,constraintoviewport:true,draggable:false});loadingMessgPanl.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_PERFORMING_TASK'));loadingMessgPanl.setBody(SUGAR.language.get('app_strings','LBL_EMAIL_ONE_MOMENT'));loadingMessgPanl.render(document.body);loadingMessgPanl.show();if(!SUGAR.quickCompose.resourcesLoaded)
@@ -861,8 +865,6 @@ this.initUI(o);},loadResources:function(o)
 
 if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var b=arguments,g=null,e,c,f;for(e=0;e<b.length;e=e+1){f=(""+b[e]).split(".");g=YAHOO;for(c=(f[0]=="YAHOO")?1:0;c<f.length;c=c+1){g[f[c]]=g[f[c]]||{};g=g[f[c]];}}return g;};YAHOO.log=function(d,a,c){var b=YAHOO.widget.Logger;if(b&&b.log){return b.log(d,a,c);}else{return false;}};YAHOO.register=function(a,f,e){var k=YAHOO.env.modules,c,j,h,g,d;if(!k[a]){k[a]={versions:[],builds:[]};}c=k[a];j=e.version;h=e.build;g=YAHOO.env.listeners;c.name=a;c.version=j;c.build=h;c.versions.push(j);c.builds.push(h);c.mainClass=f;for(d=0;d<g.length;d=d+1){g[d](c);}if(f){f.VERSION=j;f.BUILD=h;}else{YAHOO.log("mainClass is undefined for module "+a,"warn");}};YAHOO.env=YAHOO.env||{modules:[],listeners:[]};YAHOO.env.getVersion=function(a){return YAHOO.env.modules[a]||null;};YAHOO.env.parseUA=function(d){var e=function(i){var j=0;return parseFloat(i.replace(/\./g,function(){return(j++==1)?"":".";}));},h=navigator,g={ie:0,opera:0,gecko:0,webkit:0,chrome:0,mobile:null,air:0,ipad:0,iphone:0,ipod:0,ios:null,android:0,webos:0,caja:h&&h.cajaVersion,secure:false,os:null},c=d||(navigator&&navigator.userAgent),f=window&&window.location,b=f&&f.href,a;g.secure=b&&(b.toLowerCase().indexOf("https")===0);if(c){if((/windows|win32/i).test(c)){g.os="windows";}else{if((/macintosh/i).test(c)){g.os="macintosh";}else{if((/rhino/i).test(c)){g.os="rhino";}}}if((/KHTML/).test(c)){g.webkit=1;}a=c.match(/AppleWebKit\/([^\s]*)/);if(a&&a[1]){g.webkit=e(a[1]);if(/ Mobile\//.test(c)){g.mobile="Apple";a=c.match(/OS ([^\s]*)/);if(a&&a[1]){a=e(a[1].replace("_","."));}g.ios=a;g.ipad=g.ipod=g.iphone=0;a=c.match(/iPad|iPod|iPhone/);if(a&&a[0]){g[a[0].toLowerCase()]=g.ios;}}else{a=c.match(/NokiaN[^\/]*|Android \d\.\d|webOS\/\d\.\d/);if(a){g.mobile=a[0];}if(/webOS/.test(c)){g.mobile="WebOS";a=c.match(/webOS\/([^\s]*);/);if(a&&a[1]){g.webos=e(a[1]);}}if(/ Android/.test(c)){g.mobile="Android";a=c.match(/Android ([^\s]*);/);if(a&&a[1]){g.android=e(a[1]);}}}a=c.match(/Chrome\/([^\s]*)/);if(a&&a[1]){g.chrome=e(a[1]);}else{a=c.match(/AdobeAIR\/([^\s]*)/);if(a){g.air=a[0];}}}if(!g.webkit){a=c.match(/Opera[\s\/]([^\s]*)/);if(a&&a[1]){g.opera=e(a[1]);a=c.match(/Version\/([^\s]*)/);if(a&&a[1]){g.opera=e(a[1]);}a=c.match(/Opera Mini[^;]*/);if(a){g.mobile=a[0];}}else{a=c.match(/MSIE\s([^;]*)/);if(a&&a[1]){g.ie=e(a[1]);}else{a=c.match(/Gecko\/([^\s]*)/);if(a){g.gecko=1;a=c.match(/rv:([^\s\)]*)/);if(a&&a[1]){g.gecko=e(a[1]);}}}}}}return g;};YAHOO.env.ua=YAHOO.env.parseUA();(function(){YAHOO.namespace("util","widget","example");if("undefined"!==typeof YAHOO_config){var b=YAHOO_config.listener,a=YAHOO.env.listeners,d=true,c;if(b){for(c=0;c<a.length;c++){if(a[c]==b){d=false;break;}}if(d){a.push(b);}}}})();YAHOO.lang=YAHOO.lang||{};(function(){var f=YAHOO.lang,a=Object.prototype,c="[object Array]",h="[object Function]",i="[object Object]",b=[],g={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;","`":"&#x60;"},d=["toString","valueOf"],e={isArray:function(j){return a.toString.apply(j)===c;},isBoolean:function(j){return typeof j==="boolean";},isFunction:function(j){return(typeof j==="function")||a.toString.apply(j)===h;},isNull:function(j){return j===null;},isNumber:function(j){return typeof j==="number"&&isFinite(j);},isObject:function(j){return(j&&(typeof j==="object"||f.isFunction(j)))||false;},isString:function(j){return typeof j==="string";},isUndefined:function(j){return typeof j==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(l,k){var j,n,m;for(j=0;j<d.length;j=j+1){n=d[j];m=k[n];if(f.isFunction(m)&&m!=a[n]){l[n]=m;}}}:function(){},escapeHTML:function(j){return j.replace(/[&<>"'\/`]/g,function(k){return g[k];});},extend:function(m,n,l){if(!n||!m){throw new Error("extend failed, please check that "+"all dependencies are included.");}var k=function(){},j;k.prototype=n.prototype;m.prototype=new k();m.prototype.constructor=m;m.superclass=n.prototype;if(n.prototype.constructor==a.constructor){n.prototype.constructor=n;}if(l){for(j in l){if(f.hasOwnProperty(l,j)){m.prototype[j]=l[j];}}f._IEEnumFix(m.prototype,l);}},augmentObject:function(n,m){if(!m||!n){throw new Error("Absorb failed, verify dependencies.");}var j=arguments,l,o,k=j[2];if(k&&k!==true){for(l=2;l<j.length;l=l+1){n[j[l]]=m[j[l]];}}else{for(o in m){if(k||!(o in n)){n[o]=m[o];}}f._IEEnumFix(n,m);}return n;},augmentProto:function(m,l){if(!l||!m){throw new Error("Augment failed, verify dependencies.");}var j=[m.prototype,l.prototype],k;for(k=2;k<arguments.length;k=k+1){j.push(arguments[k]);}f.augmentObject.apply(this,j);return m;},dump:function(j,p){var l,n,r=[],t="{...}",k="f(){...}",q=", ",m=" => ";if(!f.isObject(j)){return j+"";}else{if(j instanceof Date||("nodeType"in j&&"tagName"in j)){return j;}else{if(f.isFunction(j)){return k;}}}p=(f.isNumber(p))?p:3;if(f.isArray(j)){r.push("[");for(l=0,n=j.length;l<n;l=l+1){if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}if(r.length>1){r.pop();}r.push("]");}else{r.push("{");for(l in j){if(f.hasOwnProperty(j,l)){r.push(l+m);if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}}if(r.length>1){r.pop();}r.push("}");}return r.join("");},substitute:function(x,y,E,l){var D,C,B,G,t,u,F=[],p,z=x.length,A="dump",r=" ",q="{",m="}",n,w;for(;;){D=x.lastIndexOf(q,z);if(D<0){break;}C=x.indexOf(m,D);if(D+1>C){break;}p=x.substring(D+1,C);G=p;u=null;B=G.indexOf(r);if(B>-1){u=G.substring(B+1);G=G.substring(0,B);}t=y[G];if(E){t=E(G,t,u);}if(f.isObject(t)){if(f.isArray(t)){t=f.dump(t,parseInt(u,10));}else{u=u||"";n=u.indexOf(A);if(n>-1){u=u.substring(4);}w=t.toString();if(w===i||n>-1){t=f.dump(t,parseInt(u,10));}else{t=w;}}}else{if(!f.isString(t)&&!f.isNumber(t)){t="~-"+F.length+"-~";F[F.length]=p;}}x=x.substring(0,D)+t+x.substring(C+1);if(l===false){z=D-1;}}for(D=F.length-1;D>=0;D=D-1){x=x.replace(new RegExp("~-"+D+"-~"),"{"+F[D]+"}","g");}return x;},trim:function(j){try{return j.replace(/^\s+|\s+$/g,"");}catch(k){return j;}},merge:function(){var n={},k=arguments,j=k.length,m;for(m=0;m<j;m=m+1){f.augmentObject(n,k[m],true);}return n;},later:function(t,k,u,n,p){t=t||0;k=k||{};var l=u,s=n,q,j;if(f.isString(u)){l=k[u];}if(!l){throw new TypeError("method undefined");}if(!f.isUndefined(n)&&!f.isArray(s)){s=[n];}q=function(){l.apply(k,s||b);};j=(p)?setInterval(q,t):setTimeout(q,t);return{interval:p,cancel:function(){if(this.interval){clearInterval(j);}else{clearTimeout(j);}}};},isValue:function(j){return(f.isObject(j)||f.isString(j)||f.isNumber(j)||f.isBoolean(j));}};f.hasOwnProperty=(a.hasOwnProperty)?function(j,k){return j&&j.hasOwnProperty&&j.hasOwnProperty(k);}:function(j,k){return!f.isUndefined(j[k])&&j.constructor.prototype[k]!==j[k];};e.augmentObject(f,e,true);YAHOO.util.Lang=f;f.augment=f.augmentProto;YAHOO.augment=f.augmentProto;YAHOO.extend=f.extend;})();YAHOO.register("yahoo",YAHOO,{version:"2.9.0",build:"2800"});YAHOO.util.Get=function(){var m={},k=0,r=0,l=false,n=YAHOO.env.ua,s=YAHOO.lang,q,d,e,i=function(x,t,y){var u=y||window,z=u.document,A=z.createElement(x),v;for(v in t){if(t.hasOwnProperty(v)){A.setAttribute(v,t[v]);}}return A;},h=function(u,v,t){var w={id:"yui__dyn_"+(r++),type:"text/css",rel:"stylesheet",href:u};if(t){s.augmentObject(w,t);}return i("link",w,v);},p=function(u,v,t){var w={id:"yui__dyn_"+(r++),type:"text/javascript",src:u};if(t){s.augmentObject(w,t);}return i("script",w,v);},a=function(t,u){return{tId:t.tId,win:t.win,data:t.data,nodes:t.nodes,msg:u,purge:function(){d(this.tId);}};},b=function(t,w){var u=m[w],v=(s.isString(t))?u.win.document.getElementById(t):t;if(!v){q(w,"target node not found: "+t);}return v;},c=function(w){YAHOO.log("Finishing transaction "+w);var u=m[w],v,t;u.finished=true;if(u.aborted){v="transaction "+w+" was aborted";q(w,v);return;}if(u.onSuccess){t=u.scope||u.win;u.onSuccess.call(t,a(u));}},o=function(v){YAHOO.log("Timeout "+v,"info","get");var u=m[v],t;if(u.onTimeout){t=u.scope||u;u.onTimeout.call(t,a(u));}},f=function(v,A){YAHOO.log("_next: "+v+", loaded: "+A,"info","Get");var u=m[v],D=u.win,C=D.document,B=C.getElementsByTagName("head")[0],x,y,t,E,z;if(u.timer){u.timer.cancel();}if(u.aborted){y="transaction "+v+" was aborted";q(v,y);return;}if(A){u.url.shift();if(u.varName){u.varName.shift();}}else{u.url=(s.isString(u.url))?[u.url]:u.url;if(u.varName){u.varName=(s.isString(u.varName))?[u.varName]:u.varName;}}if(u.url.length===0){if(u.type==="script"&&n.webkit&&n.webkit<420&&!u.finalpass&&!u.varName){z=p(null,u.win,u.attributes);z.innerHTML='YAHOO.util.Get._finalize("'+v+'");';u.nodes.push(z);B.appendChild(z);}else{c(v);}return;}t=u.url[0];if(!t){u.url.shift();YAHOO.log("skipping empty url");return f(v);}YAHOO.log("attempting to load "+t,"info","Get");if(u.timeout){u.timer=s.later(u.timeout,u,o,v);}if(u.type==="script"){x=p(t,D,u.attributes);}else{x=h(t,D,u.attributes);}e(u.type,x,v,t,D,u.url.length);u.nodes.push(x);if(u.insertBefore){E=b(u.insertBefore,v);if(E){E.parentNode.insertBefore(x,E);}}else{B.appendChild(x);}YAHOO.log("Appending node: "+t,"info","Get");if((n.webkit||n.gecko)&&u.type==="css"){f(v,t);}},j=function(){if(l){return;}l=true;var t,u;for(t in m){if(m.hasOwnProperty(t)){u=m[t];if(u.autopurge&&u.finished){d(u.tId);delete m[t];}}}l=false;},g=function(u,t,v){var x="q"+(k++),w;v=v||{};if(k%YAHOO.util.Get.PURGE_THRESH===0){j();}m[x]=s.merge(v,{tId:x,type:u,url:t,finished:false,aborted:false,nodes:[]});w=m[x];w.win=w.win||window;w.scope=w.scope||w.win;w.autopurge=("autopurge"in w)?w.autopurge:(u==="script")?true:false;w.attributes=w.attributes||{};w.attributes.charset=v.charset||w.attributes.charset||"utf-8";s.later(0,w,f,x);return{tId:x};};e=function(H,z,x,u,D,E,G){var F=G||f,B,t,I,v,J,A,C,y;if(n.ie){z.onreadystatechange=function(){B=this.readyState;if("loaded"===B||"complete"===B){YAHOO.log(x+" onload "+u,"info","Get");z.onreadystatechange=null;F(x,u);}};}else{if(n.webkit){if(H==="script"){if(n.webkit>=420){z.addEventListener("load",function(){YAHOO.log(x+" DOM2 onload "+u,"info","Get");F(x,u);});}else{t=m[x];if(t.varName){v=YAHOO.util.Get.POLL_FREQ;YAHOO.log("Polling for "+t.varName[0]);t.maxattempts=YAHOO.util.Get.TIMEOUT/v;t.attempts=0;t._cache=t.varName[0].split(".");t.timer=s.later(v,t,function(w){I=this._cache;A=I.length;J=this.win;for(C=0;C<A;C=C+1){J=J[I[C]];if(!J){this.attempts++;if(this.attempts++>this.maxattempts){y="Over retry limit, giving up";t.timer.cancel();q(x,y);}else{YAHOO.log(I[C]+" failed, retrying");}return;}}YAHOO.log("Safari poll complete");t.timer.cancel();F(x,u);},null,true);}else{s.later(YAHOO.util.Get.POLL_FREQ,null,F,[x,u]);}}}}else{z.onload=function(){YAHOO.log(x+" onload "+u,"info","Get");F(x,u);};}}};q=function(w,v){YAHOO.log("get failure: "+v,"warn","Get");var u=m[w],t;if(u.onFailure){t=u.scope||u.win;u.onFailure.call(t,a(u,v));}};d=function(z){if(m[z]){var t=m[z],u=t.nodes,x=u.length,C=t.win.document,A=C.getElementsByTagName("head")[0],v,y,w,B;if(t.insertBefore){v=b(t.insertBefore,z);if(v){A=v.parentNode;}}for(y=0;y<x;y=y+1){w=u[y];if(w.clearAttributes){w.clearAttributes();}else{for(B in w){if(w.hasOwnProperty(B)){delete w[B];}}}A.removeChild(w);}t.nodes=[];}};return{POLL_FREQ:10,PURGE_THRESH:20,TIMEOUT:2000,_finalize:function(t){YAHOO.log(t+" finalized ","info","Get");s.later(0,null,c,t);},abort:function(u){var v=(s.isString(u))?u:u.tId,t=m[v];if(t){YAHOO.log("Aborting "+v,"info","Get");t.aborted=true;}},script:function(t,u){return g("script",t,u);},css:function(t,u){return g("css",t,u);}};}();YAHOO.register("get",YAHOO.util.Get,{version:"2.9.0",build:"2800"});(function(){var Y=YAHOO,util=Y.util,lang=Y.lang,env=Y.env,PROV="_provides",SUPER="_supersedes",REQ="expanded",AFTER="_after",VERSION="2.9.0";var YUI={dupsAllowed:{"yahoo":true,"get":true},info:{"root":VERSION+"/build/","base":"http://yui.yahooapis.com/"+VERSION+"/build/","comboBase":"http://yui.yahooapis.com/combo?","skin":{"defaultSkin":"sam","base":"assets/skins/","path":"skin.css","after":["reset","fonts","grids","base"],"rollup":3},dupsAllowed:["yahoo","get"],"moduleInfo":{"animation":{"type":"js","path":"animation/animation-min.js","requires":["dom","event"]},"autocomplete":{"type":"js","path":"autocomplete/autocomplete-min.js","requires":["dom","event","datasource"],"optional":["connection","animation"],"skinnable":true},"base":{"type":"css","path":"base/base-min.css","after":["reset","fonts","grids"]},"button":{"type":"js","path":"button/button-min.js","requires":["element"],"optional":["menu"],"skinnable":true},"calendar":{"type":"js","path":"calendar/calendar-min.js","requires":["event","dom"],supersedes:["datemath"],"skinnable":true},"carousel":{"type":"js","path":"carousel/carousel-min.js","requires":["element"],"optional":["animation"],"skinnable":true},"charts":{"type":"js","path":"charts/charts-min.js","requires":["element","json","datasource","swf"]},"colorpicker":{"type":"js","path":"colorpicker/colorpicker-min.js","requires":["slider","element"],"optional":["animation"],"skinnable":true},"connection":{"type":"js","path":"connection/connection-min.js","requires":["event"],"supersedes":["connectioncore"]},"connectioncore":{"type":"js","path":"connection/connection_core-min.js","requires":["event"],"pkg":"connection"},"container":{"type":"js","path":"container/container-min.js","requires":["dom","event"],"optional":["dragdrop","animation","connection"],"supersedes":["containercore"],"skinnable":true},"containercore":{"type":"js","path":"container/container_core-min.js","requires":["dom","event"],"pkg":"container"},"cookie":{"type":"js","path":"cookie/cookie-min.js","requires":["yahoo"]},"datasource":{"type":"js","path":"datasource/datasource-min.js","requires":["event"],"optional":["connection"]},"datatable":{"type":"js","path":"datatable/datatable-min.js","requires":["element","datasource"],"optional":["calendar","dragdrop","paginator"],"skinnable":true},datemath:{"type":"js","path":"datemath/datemath-min.js","requires":["yahoo"]},"dom":{"type":"js","path":"dom/dom-min.js","requires":["yahoo"]},"dragdrop":{"type":"js","path":"dragdrop/dragdrop-min.js","requires":["dom","event"]},"editor":{"type":"js","path":"editor/editor-min.js","requires":["menu","element","button"],"optional":["animation","dragdrop"],"supersedes":["simpleeditor"],"skinnable":true},"element":{"type":"js","path":"element/element-min.js","requires":["dom","event"],"optional":["event-mouseenter","event-delegate"]},"element-delegate":{"type":"js","path":"element-delegate/element-delegate-min.js","requires":["element"]},"event":{"type":"js","path":"event/event-min.js","requires":["yahoo"]},"event-simulate":{"type":"js","path":"event-simulate/event-simulate-min.js","requires":["event"]},"event-delegate":{"type":"js","path":"event-delegate/event-delegate-min.js","requires":["event"],"optional":["selector"]},"event-mouseenter":{"type":"js","path":"event-mouseenter/event-mouseenter-min.js","requires":["dom","event"]},"fonts":{"type":"css","path":"fonts/fonts-min.css"},"get":{"type":"js","path":"get/get-min.js","requires":["yahoo"]},"grids":{"type":"css","path":"grids/grids-min.css","requires":["fonts"],"optional":["reset"]},"history":{"type":"js","path":"history/history-min.js","requires":["event"]},"imagecropper":{"type":"js","path":"imagecropper/imagecropper-min.js","requires":["dragdrop","element","resize"],"skinnable":true},"imageloader":{"type":"js","path":"imageloader/imageloader-min.js","requires":["event","dom"]},"json":{"type":"js","path":"json/json-min.js","requires":["yahoo"]},"layout":{"type":"js","path":"layout/layout-min.js","requires":["element"],"optional":["animation","dragdrop","resize","selector"],"skinnable":true},"logger":{"type":"js","path":"logger/logger-min.js","requires":["event","dom"],"optional":["dragdrop"],"skinnable":true},"menu":{"type":"js","path":"menu/menu-min.js","requires":["containercore"],"skinnable":true},"paginator":{"type":"js","path":"paginator/paginator-min.js","requires":["element"],"skinnable":true},"profiler":{"type":"js","path":"profiler/profiler-min.js","requires":["yahoo"]},"profilerviewer":{"type":"js","path":"profilerviewer/profilerviewer-min.js","requires":["profiler","yuiloader","element"],"skinnable":true},"progressbar":{"type":"js","path":"progressbar/progressbar-min.js","requires":["element"],"optional":["animation"],"skinnable":true},"reset":{"type":"css","path":"reset/reset-min.css"},"reset-fonts-grids":{"type":"css","path":"reset-fonts-grids/reset-fonts-grids.css","supersedes":["reset","fonts","grids","reset-fonts"],"rollup":4},"reset-fonts":{"type":"css","path":"reset-fonts/reset-fonts.css","supersedes":["reset","fonts"],"rollup":2},"resize":{"type":"js","path":"resize/resize-min.js","requires":["dragdrop","element"],"optional":["animation"],"skinnable":true},"selector":{"type":"js","path":"selector/selector-min.js","requires":["yahoo","dom"]},"simpleeditor":{"type":"js","path":"editor/simpleeditor-min.js","requires":["element"],"optional":["containercore","menu","button","animation","dragdrop"],"skinnable":true,"pkg":"editor"},"slider":{"type":"js","path":"slider/slider-min.js","requires":["dragdrop"],"optional":["animation"],"skinnable":true},"storage":{"type":"js","path":"storage/storage-min.js","requires":["yahoo","event","cookie"],"optional":["swfstore"]},"stylesheet":{"type":"js","path":"stylesheet/stylesheet-min.js","requires":["yahoo"]},"swf":{"type":"js","path":"swf/swf-min.js","requires":["element"],"supersedes":["swfdetect"]},"swfdetect":{"type":"js","path":"swfdetect/swfdetect-min.js","requires":["yahoo"]},"swfstore":{"type":"js","path":"swfstore/swfstore-min.js","requires":["element","cookie","swf"]},"tabview":{"type":"js","path":"tabview/tabview-min.js","requires":["element"],"optional":["connection"],"skinnable":true},"treeview":{"type":"js","path":"treeview/treeview-min.js","requires":["event","dom"],"optional":["json","animation","calendar"],"skinnable":true},"uploader":{"type":"js","path":"uploader/uploader-min.js","requires":["element"]},"utilities":{"type":"js","path":"utilities/utilities.js","supersedes":["yahoo","event","dragdrop","animation","dom","connection","element","yahoo-dom-event","get","yuiloader","yuiloader-dom-event"],"rollup":8},"yahoo":{"type":"js","path":"yahoo/yahoo-min.js"},"yahoo-dom-event":{"type":"js","path":"yahoo-dom-event/yahoo-dom-event.js","supersedes":["yahoo","event","dom"],"rollup":3},"yuiloader":{"type":"js","path":"yuiloader/yuiloader-min.js","supersedes":["yahoo","get"]},"yuiloader-dom-event":{"type":"js","path":"yuiloader-dom-event/yuiloader-dom-event.js","supersedes":["yahoo","dom","event","get","yuiloader","yahoo-dom-event"],"rollup":5},"yuitest":{"type":"js","path":"yuitest/yuitest-min.js","requires":["logger"],"optional":["event-simulate"],"skinnable":true}}},ObjectUtil:{appendArray:function(o,a){if(a){for(var i=0;i<a.length;i=i+1){o[a[i]]=true;}}},keys:function(o,ordered){var a=[],i;for(i in o){if(lang.hasOwnProperty(o,i)){a.push(i);}}return a;}},ArrayUtil:{appendArray:function(a1,a2){Array.prototype.push.apply(a1,a2);},indexOf:function(a,val){for(var i=0;i<a.length;i=i+1){if(a[i]===val){return i;}}return-1;},toObject:function(a){var o={};for(var i=0;i<a.length;i=i+1){o[a[i]]=true;}return o;},uniq:function(a){return YUI.ObjectUtil.keys(YUI.ArrayUtil.toObject(a));}}};YAHOO.util.YUILoader=function(o){this._internalCallback=null;this._useYahooListener=false;this.onSuccess=null;this.onFailure=Y.log;this.onProgress=null;this.onTimeout=null;this.scope=this;this.data=null;this.insertBefore=null;this.charset=null;this.varName=null;this.base=YUI.info.base;this.comboBase=YUI.info.comboBase;this.combine=false;this.root=YUI.info.root;this.timeout=0;this.ignore=null;this.force=null;this.allowRollup=true;this.filter=null;this.required={};this.moduleInfo=lang.merge(YUI.info.moduleInfo);this.rollups=null;this.loadOptional=false;this.sorted=[];this.loaded={};this.dirty=true;this.inserted={};var self=this;env.listeners.push(function(m){if(self._useYahooListener){self.loadNext(m.name);}});this.skin=lang.merge(YUI.info.skin);this._config(o);};Y.util.YUILoader.prototype={FILTERS:{RAW:{"searchExp":"-min\\.js","replaceStr":".js"},DEBUG:{"searchExp":"-min\\.js","replaceStr":"-debug.js"}},SKIN_PREFIX:"skin-",_config:function(o){if(o){for(var i in o){if(lang.hasOwnProperty(o,i)){if(i=="require"){this.require(o[i]);}else{this[i]=o[i];}}}}var f=this.filter;if(lang.isString(f)){f=f.toUpperCase();if(f==="DEBUG"){this.require("logger");}if(!Y.widget.LogWriter){Y.widget.LogWriter=function(){return Y;};}this.filter=this.FILTERS[f];}},addModule:function(o){if(!o||!o.name||!o.type||(!o.path&&!o.fullpath)){return false;}o.ext=("ext"in o)?o.ext:true;o.requires=o.requires||[];this.moduleInfo[o.name]=o;this.dirty=true;return true;},require:function(what){var a=(typeof what==="string")?arguments:what;this.dirty=true;YUI.ObjectUtil.appendArray(this.required,a);},_addSkin:function(skin,mod){var name=this.formatSkin(skin),info=this.moduleInfo,sinf=this.skin,ext=info[mod]&&info[mod].ext;if(!info[name]){this.addModule({"name":name,"type":"css","path":sinf.base+skin+"/"+sinf.path,"after":sinf.after,"rollup":sinf.rollup,"ext":ext});}if(mod){name=this.formatSkin(skin,mod);if(!info[name]){var mdef=info[mod],pkg=mdef.pkg||mod;this.addModule({"name":name,"type":"css","after":sinf.after,"path":pkg+"/"+sinf.base+skin+"/"+mod+".css","ext":ext});}}return name;},getRequires:function(mod){if(!mod){return[];}if(!this.dirty&&mod.expanded){return mod.expanded;}mod.requires=mod.requires||[];var i,d=[],r=mod.requires,o=mod.optional,info=this.moduleInfo,m;for(i=0;i<r.length;i=i+1){d.push(r[i]);m=info[r[i]];YUI.ArrayUtil.appendArray(d,this.getRequires(m));}if(o&&this.loadOptional){for(i=0;i<o.length;i=i+1){d.push(o[i]);YUI.ArrayUtil.appendArray(d,this.getRequires(info[o[i]]));}}mod.expanded=YUI.ArrayUtil.uniq(d);return mod.expanded;},getProvides:function(name,notMe){var addMe=!(notMe),ckey=(addMe)?PROV:SUPER,m=this.moduleInfo[name],o={};if(!m){return o;}if(m[ckey]){return m[ckey];}var s=m.supersedes,done={},me=this;var add=function(mm){if(!done[mm]){done[mm]=true;lang.augmentObject(o,me.getProvides(mm));}};if(s){for(var i=0;i<s.length;i=i+1){add(s[i]);}}m[SUPER]=o;m[PROV]=lang.merge(o);m[PROV][name]=true;return m[ckey];},calculate:function(o){if(o||this.dirty){this._config(o);this._setup();this._explode();if(this.allowRollup){this._rollup();}this._reduce();this._sort();this.dirty=false;}},_setup:function(){var info=this.moduleInfo,name,i,j;for(name in info){if(lang.hasOwnProperty(info,name)){var m=info[name];if(m&&m.skinnable){var o=this.skin.overrides,smod;if(o&&o[name]){for(i=0;i<o[name].length;i=i+1){smod=this._addSkin(o[name][i],name);}}else{smod=this._addSkin(this.skin.defaultSkin,name);}if(YUI.ArrayUtil.indexOf(m.requires,smod)==-1){m.requires.push(smod);}}}}var l=lang.merge(this.inserted);if(!this._sandbox){l=lang.merge(l,env.modules);}if(this.ignore){YUI.ObjectUtil.appendArray(l,this.ignore);}if(this.force){for(i=0;i<this.force.length;i=i+1){if(this.force[i]in l){delete l[this.force[i]];}}}for(j in l){if(lang.hasOwnProperty(l,j)){lang.augmentObject(l,this.getProvides(j));}}this.loaded=l;},_explode:function(){var r=this.required,i,mod;for(i in r){if(lang.hasOwnProperty(r,i)){mod=this.moduleInfo[i];if(mod){var req=this.getRequires(mod);if(req){YUI.ObjectUtil.appendArray(r,req);}}}}},_skin:function(){},formatSkin:function(skin,mod){var s=this.SKIN_PREFIX+skin;if(mod){s=s+"-"+mod;}return s;},parseSkin:function(mod){if(mod.indexOf(this.SKIN_PREFIX)===0){var a=mod.split("-");return{skin:a[1],module:a[2]};}return null;},_rollup:function(){var i,j,m,s,rollups={},r=this.required,roll,info=this.moduleInfo;if(this.dirty||!this.rollups){for(i in info){if(lang.hasOwnProperty(info,i)){m=info[i];if(m&&m.rollup){rollups[i]=m;}}}this.rollups=rollups;}for(;;){var rolled=false;for(i in rollups){if(!r[i]&&!this.loaded[i]){m=info[i];s=m.supersedes;roll=false;if(!m.rollup){continue;}var skin=(m.ext)?false:this.parseSkin(i),c=0;if(skin){for(j in r){if(lang.hasOwnProperty(r,j)){if(i!==j&&this.parseSkin(j)){c++;roll=(c>=m.rollup);if(roll){break;}}}}}else{for(j=0;j<s.length;j=j+1){if(this.loaded[s[j]]&&(!YUI.dupsAllowed[s[j]])){roll=false;break;}else{if(r[s[j]]){c++;roll=(c>=m.rollup);if(roll){break;}}}}}if(roll){r[i]=true;rolled=true;this.getRequires(m);}}}if(!rolled){break;}}},_reduce:function(){var i,j,s,m,r=this.required;for(i in r){if(i in this.loaded){delete r[i];}else{var skinDef=this.parseSkin(i);if(skinDef){if(!skinDef.module){var skin_pre=this.SKIN_PREFIX+skinDef.skin;for(j in r){if(lang.hasOwnProperty(r,j)){m=this.moduleInfo[j];var ext=m&&m.ext;if(!ext&&j!==i&&j.indexOf(skin_pre)>-1){delete r[j];}}}}}else{m=this.moduleInfo[i];s=m&&m.supersedes;if(s){for(j=0;j<s.length;j=j+1){if(s[j]in r){delete r[s[j]];}}}}}}},_onFailure:function(msg){YAHOO.log("Failure","info","loader");var f=this.onFailure;if(f){f.call(this.scope,{msg:"failure: "+msg,data:this.data,success:false});}},_onTimeout:function(){YAHOO.log("Timeout","info","loader");var f=this.onTimeout;if(f){f.call(this.scope,{msg:"timeout",data:this.data,success:false});}},_sort:function(){var s=[],info=this.moduleInfo,loaded=this.loaded,checkOptional=!this.loadOptional,me=this;var requires=function(aa,bb){var mm=info[aa];if(loaded[bb]||!mm){return false;}var ii,rr=mm.expanded,after=mm.after,other=info[bb],optional=mm.optional;if(rr&&YUI.ArrayUtil.indexOf(rr,bb)>-1){return true;}if(after&&YUI.ArrayUtil.indexOf(after,bb)>-1){return true;}if(checkOptional&&optional&&YUI.ArrayUtil.indexOf(optional,bb)>-1){return true;}var ss=info[bb]&&info[bb].supersedes;if(ss){for(ii=0;ii<ss.length;ii=ii+1){if(requires(aa,ss[ii])){return true;}}}if(mm.ext&&mm.type=="css"&&!other.ext&&other.type=="css"){return true;}return false;};for(var i in this.required){if(lang.hasOwnProperty(this.required,i)){s.push(i);}}var p=0;for(;;){var l=s.length,a,b,j,k,moved=false;for(j=p;j<l;j=j+1){a=s[j];for(k=j+1;k<l;k=k+1){if(requires(a,s[k])){b=s.splice(k,1);s.splice(j,0,b[0]);moved=true;break;}}if(moved){break;}else{p=p+1;}}if(!moved){break;}}this.sorted=s;},toString:function(){var o={type:"YUILoader",base:this.base,filter:this.filter,required:this.required,loaded:this.loaded,inserted:this.inserted};lang.dump(o,1);},_combine:function(){this._combining=[];var self=this,s=this.sorted,len=s.length,js=this.comboBase,css=this.comboBase,target,startLen=js.length,i,m,type=this.loadType;YAHOO.log("type "+type);for(i=0;i<len;i=i+1){m=this.moduleInfo[s[i]];if(m&&!m.ext&&(!type||type===m.type)){target=this.root+m.path;target+="&";if(m.type=="js"){js+=target;}else{css+=target;}this._combining.push(s[i]);}}if(this._combining.length){YAHOO.log("Attempting to combine: "+this._combining,"info","loader");var callback=function(o){var c=this._combining,len=c.length,i,m;for(i=0;i<len;i=i+1){this.inserted[c[i]]=true;}this.loadNext(o.data);},loadScript=function(){if(js.length>startLen){YAHOO.util.Get.script(self._filter(js),{data:self._loading,onSuccess:callback,onFailure:self._onFailure,onTimeout:self._onTimeout,insertBefore:self.insertBefore,charset:self.charset,timeout:self.timeout,scope:self});}else{this.loadNext();}};if(css.length>startLen){YAHOO.util.Get.css(this._filter(css),{data:this._loading,onSuccess:loadScript,onFailure:this._onFailure,onTimeout:this._onTimeout,insertBefore:this.insertBefore,charset:this.charset,timeout:this.timeout,scope:self});}else{loadScript();}return;}else{this.loadNext(this._loading);}},insert:function(o,type){this.calculate(o);this._loading=true;this.loadType=type;if(this.combine){return this._combine();}if(!type){var self=this;this._internalCallback=function(){self._internalCallback=null;self.insert(null,"js");};this.insert(null,"css");return;}this.loadNext();},sandbox:function(o,type){var self=this,success=function(o){var idx=o.argument[0],name=o.argument[2];self._scriptText[idx]=o.responseText;if(self.onProgress){self.onProgress.call(self.scope,{name:name,scriptText:o.responseText,xhrResponse:o,data:self.data});}self._loadCount++;if(self._loadCount>=self._stopCount){var v=self.varName||"YAHOO";var t="(function() {\n";var b="\nreturn "+v+";\n})();";var ref=eval(t+self._scriptText.join("\n")+b);self._pushEvents(ref);if(ref){self.onSuccess.call(self.scope,{reference:ref,data:self.data});}else{self._onFailure.call(self.varName+" reference failure");}}},failure=function(o){self.onFailure.call(self.scope,{msg:"XHR failure",xhrResponse:o,data:self.data});};self._config(o);if(!self.onSuccess){throw new Error("You must supply an onSuccess handler for your sandbox");}self._sandbox=true;if(!type||type!=="js"){self._internalCallback=function(){self._internalCallback=null;self.sandbox(null,"js");};self.insert(null,"css");return;}if(!util.Connect){var ld=new YAHOO.util.YUILoader();ld.insert({base:self.base,filter:self.filter,require:"connection",insertBefore:self.insertBefore,charset:self.charset,onSuccess:function(){self.sandbox(null,"js");},scope:self},"js");return;}self._scriptText=[];self._loadCount=0;self._stopCount=self.sorted.length;self._xhr=[];self.calculate();var s=self.sorted,l=s.length,i,m,url;for(i=0;i<l;i=i+1){m=self.moduleInfo[s[i]];if(!m){self._onFailure("undefined module "+m);for(var j=0;j<self._xhr.length;j=j+1){self._xhr[j].abort();}return;}if(m.type!=="js"){self._loadCount++;continue;}url=m.fullpath;url=(url)?self._filter(url):self._url(m.path);var xhrData={success:success,failure:failure,scope:self,argument:[i,url,s[i]]};self._xhr.push(util.Connect.asyncRequest("GET",url,xhrData));}},loadNext:function(mname){if(!this._loading){return;}var self=this,donext=function(o){self.loadNext(o.data);},successfn,s=this.sorted,len=s.length,i,fn,m,url;if(mname){if(mname!==this._loading){return;}this.inserted[mname]=true;if(this.onProgress){this.onProgress.call(this.scope,{name:mname,data:this.data});}}for(i=0;i<len;i=i+1){if(s[i]in this.inserted){continue;}if(s[i]===this._loading){return;}m=this.moduleInfo[s[i]];if(!m){this.onFailure.call(this.scope,{msg:"undefined module "+m,data:this.data});return;}if(!this.loadType||this.loadType===m.type){successfn=donext;this._loading=s[i];fn=(m.type==="css")?util.Get.css:util.Get.script;url=m.fullpath;url=(url)?this._filter(url):this._url(m.path);if(env.ua.webkit&&env.ua.webkit<420&&m.type==="js"&&!m.varName){successfn=null;this._useYahooListener=true;}fn(url,{data:s[i],onSuccess:successfn,onFailure:this._onFailure,onTimeout:this._onTimeout,insertBefore:this.insertBefore,charset:this.charset,timeout:this.timeout,varName:m.varName,scope:self});return;}}this._loading=null;if(this._internalCallback){var f=this._internalCallback;this._internalCallback=null;f.call(this);}else{if(this.onSuccess){this._pushEvents();this.onSuccess.call(this.scope,{data:this.data});}}},_pushEvents:function(ref){var r=ref||YAHOO;if(r.util&&r.util.Event){r.util.Event._load();}},_filter:function(str){var f=this.filter;return(f)?str.replace(new RegExp(f.searchExp,"g"),f.replaceStr):str;},_url:function(path){return this._filter((this.base||"")+path);}};})();YAHOO.register("yuiloader",YAHOO.util.YUILoader,{version:"2.9.0",build:"2800"});/* End of File include/javascript/yui/build/yuiloader/yuiloader-min.js */
 
-/* End of File include/javascript/phpjs/license.js */
-
 
 function get_html_translation_table(table,quote_style){var entities={},hash_map={},decimal=0,symbol='';var constMappingTable={},constMappingQuoteStyle={};var useTable={},useQuoteStyle={};constMappingTable[0]='HTML_SPECIALCHARS';constMappingTable[1]='HTML_ENTITIES';constMappingQuoteStyle[0]='ENT_NOQUOTES';constMappingQuoteStyle[2]='ENT_COMPAT';constMappingQuoteStyle[3]='ENT_QUOTES';useTable=!isNaN(table)?constMappingTable[table]:table?table.toUpperCase():'HTML_SPECIALCHARS';useQuoteStyle=!isNaN(quote_style)?constMappingQuoteStyle[quote_style]:quote_style?quote_style.toUpperCase():'ENT_COMPAT';if(useTable!=='HTML_SPECIALCHARS'&&useTable!=='HTML_ENTITIES'){throw new Error("Table: "+useTable+' not supported');}
 entities['38']='&amp;';if(useTable==='HTML_ENTITIES'){entities['160']='&nbsp;';entities['161']='&iexcl;';entities['162']='&cent;';entities['163']='&pound;';entities['164']='&curren;';entities['165']='&yen;';entities['166']='&brvbar;';entities['167']='&sect;';entities['168']='&uml;';entities['169']='&copy;';entities['170']='&ordf;';entities['171']='&laquo;';entities['172']='&not;';entities['173']='&shy;';entities['174']='&reg;';entities['175']='&macr;';entities['176']='&deg;';entities['177']='&plusmn;';entities['178']='&sup2;';entities['179']='&sup3;';entities['180']='&acute;';entities['181']='&micro;';entities['182']='&para;';entities['183']='&middot;';entities['184']='&cedil;';entities['185']='&sup1;';entities['186']='&ordm;';entities['187']='&raquo;';entities['188']='&frac14;';entities['189']='&frac12;';entities['190']='&frac34;';entities['191']='&iquest;';entities['192']='&Agrave;';entities['193']='&Aacute;';entities['194']='&Acirc;';entities['195']='&Atilde;';entities['196']='&Auml;';entities['197']='&Aring;';entities['198']='&AElig;';entities['199']='&Ccedil;';entities['200']='&Egrave;';entities['201']='&Eacute;';entities['202']='&Ecirc;';entities['203']='&Euml;';entities['204']='&Igrave;';entities['205']='&Iacute;';entities['206']='&Icirc;';entities['207']='&Iuml;';entities['208']='&ETH;';entities['209']='&Ntilde;';entities['210']='&Ograve;';entities['211']='&Oacute;';entities['212']='&Ocirc;';entities['213']='&Otilde;';entities['214']='&Ouml;';entities['215']='&times;';entities['216']='&Oslash;';entities['217']='&Ugrave;';entities['218']='&Uacute;';entities['219']='&Ucirc;';entities['220']='&Uuml;';entities['221']='&Yacute;';entities['222']='&THORN;';entities['223']='&szlig;';entities['224']='&agrave;';entities['225']='&aacute;';entities['226']='&acirc;';entities['227']='&atilde;';entities['228']='&auml;';entities['229']='&aring;';entities['230']='&aelig;';entities['231']='&ccedil;';entities['232']='&egrave;';entities['233']='&eacute;';entities['234']='&ecirc;';entities['235']='&euml;';entities['236']='&igrave;';entities['237']='&iacute;';entities['238']='&icirc;';entities['239']='&iuml;';entities['240']='&eth;';entities['241']='&ntilde;';entities['242']='&ograve;';entities['243']='&oacute;';entities['244']='&ocirc;';entities['245']='&otilde;';entities['246']='&ouml;';entities['247']='&divide;';entities['248']='&oslash;';entities['249']='&ugrave;';entities['250']='&uacute;';entities['251']='&ucirc;';entities['252']='&uuml;';entities['253']='&yacute;';entities['254']='&thorn;';entities['255']='&yuml;';}
diff --git a/cache/include/javascript/sugar_grp1_jquery.js b/cache/include/javascript/sugar_grp1_jquery.js
index 53c2685f..f1d8c0fa 100644
--- a/cache/include/javascript/sugar_grp1_jquery.js
+++ b/cache/include/javascript/sugar_grp1_jquery.js
@@ -2328,7 +2328,7 @@ Note:
  *          ...                             -  Elements in popout menu
  *          <li></li>                       - /
  *          <li>
- *              <a></a> or <input></input>  - element contains submenu
+ *              <input></input>  - element contains submenu
  *              <ul class="subnav-sub">     - sub-popout menu (shown when mouseover on the above element)
  *                  <li></li>               - \
  *                  ...                     -  Elements in sub-popout menu
diff --git a/cache/include/javascript/sugar_grp_emails.js b/cache/include/javascript/sugar_grp_emails.js
index 0733cfc6..309419ff 100644
--- a/cache/include/javascript/sugar_grp_emails.js
+++ b/cache/include/javascript/sugar_grp_emails.js
@@ -386,8 +386,8 @@ if(!SUGAR.smtpButtonGroup){SUGAR.smtpButtonGroup=new YAHOO.widget.ButtonGroup("s
 SUGAR.email2.accounts.smtp_authenticate_field_display();SUGAR.email2.accounts.toggleOutboundAccountDisabledFields(false);SUGAR.email2.accounts.changeEmailScreenDisplay('other');this.outboundDialog.render();this.outboundDialog.show();},toggleAdv:function(){var adv=document.getElementById("ie_adv");if(adv.style.display=='none'){adv.style.display="";}else{adv.style.display='none';}},smtp_authenticate_field_display:function(){var smtpauth_req=document.getElementById("mail_smtpauth_req");document.getElementById("smtp_auth1").style.display=smtpauth_req.checked?"":"none";document.getElementById("smtp_auth2").style.display=smtpauth_req.checked?"":"none";},smtp_setDefaultSMTPPort:function(){useSSLPort=!document.getElementById("mail_smtpssl").options[0].selected;if(useSSLPort&&document.getElementById("mail_smtpport").value=='25'){document.getElementById("mail_smtpport").value='465';}
 if(!useSSLPort&&document.getElementById("mail_smtpport").value=='465'){document.getElementById("mail_smtpport").value='25';}},changeEmailScreenDisplay:function(smtptype,isSystemAccount)
 {document.getElementById("smtpButtonGroupTD").style.display='';document.getElementById("chooseEmailProviderTD").style.display='';document.getElementById("mailsettings1").style.display='';document.getElementById("mailsettings2").style.display='';document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_MAIL_SMTPPASS;document.getElementById("mail_smtpport_label").innerHTML=mod_strings.LBL_MAIL_SMTPPORT;document.getElementById("mail_smtpserver_label").innerHTML=mod_strings.LBL_MAIL_SMTPSERVER;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_MAIL_SMTPUSER;switch(smtptype){case"yahoomail":document.getElementById("mail_smtpserver").value='plus.smtp.mail.yahoo.com';document.getElementById("mail_smtpport").value='465';document.getElementById("mail_smtpauth_req").checked=true;var ssl=document.getElementById("mail_smtpssl");for(var j=0;j<ssl.options.length;j++){if(ssl.options[j].text=='SSL'){ssl.options[j].selected=true;break;}}
-document.getElementById("mailsettings1").style.display='none';document.getElementById("mailsettings2").style.display='none';document.getElementById("mail_smtppass_label").innerHTML=document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_YAHOOMAIL_SMTPPASS;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_YAHOOMAIL_SMTPUSER;break;case"gmail":document.getElementById("mail_smtpserver").value='smtp.gmail.com';document.getElementById("mail_smtpport").value='587';document.getElementById("mail_smtpauth_req").checked=true;var ssl=document.getElementById("mail_smtpssl");for(var j=0;j<ssl.options.length;j++){if(ssl.options[j].text=='TLS'){ssl.options[j].selected=true;break;}}
-document.getElementById("mailsettings1").style.display='none';document.getElementById("mailsettings2").style.display='none';document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_GMAIL_SMTPPASS;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_GMAIL_SMTPUSER;break;case"exchange":if(document.getElementById("mail_smtpserver").value=='plus.smtp.mail.yahoo.com'||document.getElementById("mail_smtpserver").value=='smtp.gmail.com'){document.getElementById("mail_smtpserver").value='';}
+document.getElementById("mailsettings1").style.display='none';document.getElementById("mailsettings2").style.display='none';document.getElementById("mail_smtppass_label").innerHTML=document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_YAHOOMAIL_SMTPPASS;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_YAHOOMAIL_SMTPUSER;break;case"gmail":if(document.getElementById("mail_smtpserver").value==""||document.getElementById("mail_smtpserver").value=='plus.smtp.mail.yahoo.com'){document.getElementById("mail_smtpserver").value='smtp.gmail.com';document.getElementById("mail_smtpport").value='587';document.getElementById("mail_smtpauth_req").checked=true;var ssl=document.getElementById("mail_smtpssl");for(var j=0;j<ssl.options.length;j++){if(ssl.options[j].text=='TLS'){ssl.options[j].selected=true;break;}}}
+document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_GMAIL_SMTPPASS;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_GMAIL_SMTPUSER;break;case"exchange":if(document.getElementById("mail_smtpserver").value=='plus.smtp.mail.yahoo.com'||document.getElementById("mail_smtpserver").value=='smtp.gmail.com'){document.getElementById("mail_smtpserver").value='';}
 document.getElementById("mail_smtpport").value='25';document.getElementById("mail_smtpauth_req").checked=true;document.getElementById("mailsettings1").style.display='';document.getElementById("mailsettings2").style.display='';document.getElementById("mail_smtppass_label").innerHTML=mod_strings.LBL_EXCHANGE_SMTPPASS;document.getElementById("mail_smtpport_label").innerHTML=mod_strings.LBL_EXCHANGE_SMTPPORT;document.getElementById("mail_smtpserver_label").innerHTML=mod_strings.LBL_EXCHANGE_SMTPSERVER;document.getElementById("mail_smtpuser_label").innerHTML=mod_strings.LBL_EXCHANGE_SMTPUSER;break;}
 if((typeof isSystemAccount!='undefined')&&isSystemAccount)
 {document.getElementById("smtpButtonGroupTD").style.display='none';document.getElementById("chooseEmailProviderTD").style.display='none';document.getElementById("mailsettings2").style.display='none';}
@@ -525,7 +525,7 @@ return;if(mbox.indexOf("sugar::")===0){var node=this.getNodeFromId(ieId);}else{v
 if(node){var unseen=node.data.unseen;if(unseen>0){var check=unseen-count;var finalCount=(check>=0)?check:0;node.data.unseen=finalCount;}
 SE.accounts.renderTree();}},getNodeFromId:function(id){SE.folders.focusNode=null;SE.util.cascadeNodes(SE.tree.getRoot(),function(ieId){if((this.data.id&&this.data.id==ieId)||(this.data.ieId&&this.data.ieId==ieId)){SE.folders.focusNode=this;return false;}},null,[id]);return SE.folders.focusNode;},getNodeFromIeIdAndMailbox:function(id,mbox){SE.folders.focusNode=null;if(mbox=="sugar::Emails"){mbox=id;id="folder";}
 SE.util.cascadeNodes(SE.tree.getRoot(),function(varsarray){if(varsarray instanceof Array){if(this.data.ieId&&this.data.ieId==varsarray[0]&&this.data.mbox==varsarray[1]){SE.folders.focusNode=this;return false;}}
-else{if(this.data.ieId&&this.data.ieId==varsarray){SE.folders.focusNode=this;return false;}}},null,[id,mbox]);return SE.folders.focusNode;},unhighliteAll:function(){SE.util.cascadeNodes(SE.tree.getRoot(),function(){this.unhighlight()});},folderAdd:function(){SE.contextMenus.frameFoldersContextMenu.hide();var node=SE.clickedFolderNode;if(node!=null&&node.data){SUGAR.showMessageBox(app_strings.LBL_EMAIL_FOLDERS_ADD_DIALOG_TITLE,app_strings.LBL_EMAIL_SETTINGS_NAME,'prompt',{fn:SE.folders.folderAddXmlCall,beforeShow:SE.folders.folderAddRegisterEnter,beforeHide:SE.folders.folderRemoveRegisterEnter});}else{alert(app_strings.LBL_EMAIL_FOLDERS_NO_VALID_NODE);}},folderAddRegisterEnter:function(){this.enterKeyListener=new YAHOO.util.KeyListener(YAHOO.util.Dom.get("sugar-message-prompt"),{keys:YAHOO.util.KeyListener.KEY.ENTER},this.buttons[1].handler);this.enterKeyListener.enable();},folderRemoveRegisterEnter:function(){this.enterKeyListener.disable();},folderAddXmlCall:function(name){if(trim(name)==""){alert(mod_strings.LBL_ENTER_FOLDER_NAME);return false;}
+else{if(this.data.ieId&&this.data.ieId==varsarray){SE.folders.focusNode=this;return false;}}},null,[id,mbox]);return SE.folders.focusNode;},unhighliteAll:function(){SE.util.cascadeNodes(SE.tree.getRoot(),function(){this.unhighlight()});},folderAdd:function(){SE.contextMenus.frameFoldersContextMenu.hide();var node=SE.clickedFolderNode;if(node!=null&&node.data){SUGAR.showMessageBox(app_strings.LBL_EMAIL_FOLDERS_ADD_DIALOG_TITLE,app_strings.LBL_EMAIL_FOLDERS_NEW_FOLDER,'prompt',{fn:SE.folders.folderAddXmlCall,beforeShow:SE.folders.folderAddRegisterEnter,beforeHide:SE.folders.folderRemoveRegisterEnter});}else{alert(app_strings.LBL_EMAIL_FOLDERS_NO_VALID_NODE);}},folderAddRegisterEnter:function(){this.enterKeyListener=new YAHOO.util.KeyListener(YAHOO.util.Dom.get("sugar-message-prompt"),{keys:YAHOO.util.KeyListener.KEY.ENTER},this.buttons[1].handler);this.enterKeyListener.enable();},folderRemoveRegisterEnter:function(){this.enterKeyListener.disable();},folderAddXmlCall:function(name){if(trim(name)==""){alert(mod_strings.LBL_ENTER_FOLDER_NAME);return false;}
 name=escape(name);var post='';var type='sugar';var parentNode=SE.clickedFolderNode;this.contextMenuFocus=parentNode;if(parentNode.data.ieId){if(parentNode.data.ieId!='folder'&&parentNode.data.ieId.match(SE.reGUID)){type='imap';}}
 if(type=='imap'){post="&newFolderName="+name+"&mbox="+parentNode.data.mbox+"&ieId="+parentNode.data.ieId;AjaxObject.startRequest(callbackFolderRename,urlStandard+'&emailUIAction=saveNewFolder&folderType=imap'+post);}else if(type=='sugar'){if(SE.folders.isUniqueFolderName(name)){post="&parentId="+parentNode.data.id+"&nodeLabel="+name;AjaxObject.startRequest(callbackFolderSave,urlStandard+'&emailUIAction=saveNewFolder&folderType=sugar&'+post);}else{alert(app_strings.LBL_EMAIL_ERROR_DUPE_FOLDER_NAME);SE.folders.folderAdd();return;}}else{alert(app_strings.LBL_EMAIL_ERROR_CANNOT_FIND_NODE);}
 SE.e2overlay.hide();},folderDelete:function(){SE.contextMenus.frameFoldersContextMenu.hide();if(confirm(app_strings.LBL_EMAIL_FOLDERS_DELETE_CONFIRM)){var post='';var parentNode=SE.clickedFolderNode;if(parentNode!=null&&parentNode.data){if(parentNode.data.mbox=='INBOX'||parentNode.data.id=='Home'){SUGAR.showMessageBox(app_strings.LBL_EMAIL_ERROR_GENERAL_TITLE,app_strings.LBL_EMAIL_FOLDERS_CHANGE_HOME,'alert');return;}
@@ -685,7 +685,7 @@ return address;},init:function(idx){var ds=new YAHOO.widget.DS_JSArray(this.retu
 SE.autoComplete.instances[idx]['to'].dataSource.data=refresh;SE.autoComplete.instances[idx]['cc'].dataSource.data=refresh;SE.autoComplete.instances[idx]['bcc'].dataSource.data=refresh;},returnDataSource:function(contacts){var ret=new Array();for(var id in contacts){if(contacts[id].name){var primary=this.getPrimaryAddress(contacts[id]);ret[ret.length]=contacts[id].name.replace(/<[\/]*b>/gi,'')+" <"+primary+">";for(var emailIndex in contacts[id].email){ret[ret.length]=contacts[id].email[emailIndex].email_address;}}}
 return ret;},toggleTextareaHide:function(sType,aArgs){var textBoxId=aArgs[0]._oTextbox.id;var type="";var idx=-1;if(textBoxId.indexOf("addressTO")>-1){type="to";}else if(textBoxId.indexOf("addressCC")>-1){type="cc";}
 idx=textBoxId.substr(9);if(type!=""){var cc=document.getElementById("addressCC"+idx);var bcc=document.getElementById("addressBCC"+idx);switch(type){case"to":cc.style.visibility='hidden';case"cc":bcc.style.visibility='hidden';break;}}},toggleTextareaShow:function(sType,aArgs){var textBoxId=aArgs[0]._oTextbox.id;var type="";var idx=-1;if(textBoxId.indexOf("addressTO")>-1){type="to";}else if(textBoxId.indexOf("addressCC")>-1){type="cc";}
-idx=textBoxId.substr(9);if(type!=""){document.getElementById("addressCC"+idx).style.visibility='visible';document.getElementById("addressBCC"+idx).style.visibility='visible';}}};SE.composeLayout={currentInstanceId:0,ccHidden:true,bccHidden:true,outboundAccountErrors:null,loadedTinyInstances:{},showAddressDetails:function(e){var linkElement=document.getElementById("More"+e.id);var spanElement=document.getElementById("Detail"+e.id);var emailAddressList=e.value;if(e.value.length>96)
+idx=textBoxId.substr(9);if(type!=""){document.getElementById("addressCC"+idx).style.visibility='visible';document.getElementById("addressBCC"+idx).style.visibility='visible';}}};SE.composeLayout={currentInstanceId:0,ccHidden:true,bccHidden:true,outboundAccountErrors:null,loadedTinyInstances:{},subjectMaxlen:255,showAddressDetails:function(e){var linkElement=document.getElementById("More"+e.id);var spanElement=document.getElementById("Detail"+e.id);var emailAddressList=e.value;if(e.value.length>96)
 {var resultArray=SE.composeLayout._getEmailArrayFromString(emailAddressList);var displayArray=[];for(var i=0;i<resultArray.length;i++)
 {var t_name=resultArray[i].name;var t_emailAddr=resultArray[i].email_address;if(t_name=='')
 displayArray.push('<br/>&lt;'+t_emailAddr+'&gt;');else
@@ -761,14 +761,14 @@ else
 t.setContent(newHtml);}},prepareSignature:function(str){var signature=new String(str);signature=signature.replace(/&lt;/gi,'<');signature=signature.replace(/&gt;/gi,'>');return signature;},showAttachmentPanel:function(idx){var east=SE.composeLayout[idx].getUnitByPosition("right");var tabs=SE.composeLayout[idx].rightTabs;east.expand();tabs.set("activeTab",tabs.getTab(0));},showOptionsPanel:function(idx){var east=SE.composeLayout[idx].getUnitByPosition("right");var tabs=SE.composeLayout[idx].rightTabs;east.expand();tabs.set("activeTab",tabs.getTab(1));},showContactsPanel:function(){SE.complexLayout.regions.west.showPanel("contactsTab");},addDocumentField:function(idx){var basket=document.getElementById('addedDocuments'+idx);if(basket){var index=(basket.childNodes.length / 7)-1;if(index<0)
 index=0;}else{index=0;}
 var test=document.getElementById('documentId'+idx+index);while(test!=null){index++;test=document.getElementById('documentId'+idx+index);}
-var documentCup=document.createElement("div");documentCup.id='documentCup'+idx+index;documentCup.innerHTML="<input type='hidden' name='document"+idx+index+"' id='document"+idx+index+"' />"+"<input type='hidden' name='documentId"+idx+index+"' id='documentId"+idx+index+"' />"+"<input value='' size='15' disabled='true' type='text' name='documentName"+idx+index+"' id='documentName"+idx+index+"' />"+"<button class='button firstChild' type='button' name='documentSelect"+idx+index+"' id='documentSelect"+idx+index+"'"+"onclick='SE.composeLayout.selectDocument(\""+index+"\");' value='"+app_strings.LBL_EMAIL_SELECT+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-select.png' ></button>"+"<button class='button lastChild' type='button' name='documentRemove"+idx+index+"' id='documentRemove"+idx+index+"'"+"onclick='SE.composeLayout.deleteDocumentField(\"documentCup"+idx+index+"\");' value='"+app_strings.LBL_EMAIL_REMOVE+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-clear.png' ></button>"+"<br/>";basket.appendChild(documentCup);return index;},saveDraft:function(tinyInstance){this.sendEmail(tinyInstance,true);},selectDocument:function(target){URL="index.php?module=Emails&action=PopupDocuments&to_pdf=true&target="+target;windowName='selectDocument';windowFeatures='width=800'+',height=600'+',resizable=1,scrollbars=1';win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus){win.focus();}},addFileField:function(){if(!SE.addFileDialog){SE.addFileDialog=new YAHOO.widget.Dialog("addFileDialog",{modal:true,visible:false,fixedcenter:true,constraintoviewport:true,scroll:true,keylisteners:new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){SE.addFileDialog.hide();}})});SE.addFileDialog.setHeader(app_strings.LBL_EMAIL_ATTACHMENTS);SE.addFileDialog.render();}
+var documentCup=document.createElement("div");documentCup.id='documentCup'+idx+index;documentCup.innerHTML="<input type='hidden' name='document"+idx+index+"' id='document"+idx+index+"' />"+"<input type='hidden' name='documentId"+idx+index+"' id='documentId"+idx+index+"' />"+"<input value='' size='15' disabled='true' type='text' name='documentName"+idx+index+"' id='documentName"+idx+index+"' />"+"<button class='button firstChild' type='button' name='documentSelect"+idx+index+"' id='documentSelect"+idx+index+"'"+"onclick='SE.composeLayout.selectDocument(\""+index+"\");' value='"+app_strings.LBL_EMAIL_SELECT+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-select.png' ></button>"+"<button class='button lastChild' type='button' name='documentRemove"+idx+index+"' id='documentRemove"+idx+index+"'"+"onclick='SE.composeLayout.deleteDocumentField(\"documentCup"+idx+index+"\");' value='"+app_strings.LBL_EMAIL_REMOVE+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-clear.png' ></button>"+"<br/>";basket.appendChild(documentCup);return index;},saveDraft:function(tinyInstance){SE.tinyInstances.currentHtmleditor='htmleditor'+tinyInstance;this.sendEmail(tinyInstance,true);},selectDocument:function(target){URL="index.php?module=Emails&action=PopupDocuments&to_pdf=true&target="+target;windowName='selectDocument';windowFeatures='width=800'+',height=600'+',resizable=1,scrollbars=1';win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus){win.focus();}},addFileField:function(){if(!SE.addFileDialog){SE.addFileDialog=new YAHOO.widget.Dialog("addFileDialog",{modal:true,visible:false,fixedcenter:true,constraintoviewport:true,scroll:true,keylisteners:new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){SE.addFileDialog.hide();}})});SE.addFileDialog.setHeader(app_strings.LBL_EMAIL_ATTACHMENTS);SE.addFileDialog.render();}
 Dom.removeClass("addFileDialog","yui-hidden");SE.addFileDialog.show();},uploadAttachment:function(){if(document.getElementById('email_attachment').value!=""){var formObject=document.getElementById('uploadAttachment');YAHOO.util.Connect.setForm(formObject,true,true);AjaxObject.target='';AjaxObject.startRequest(callbackUploadAttachment,null);}else{alert(app_strings.LBL_EMAIL_ERROR_NO_FILE);}},setDocument:function(idx,target,documentId,documentName,docRevId){var addedDocs=document.getElementById("addedDocuments"+idx);var docId=document.getElementById('documentId'+idx+target);var docName=document.getElementById('documentName'+idx+target);var docRevisionId=document.getElementById('document'+idx+target);docId.value=documentId;docName.value=documentName;docRevisionId.value=docRevId;},deleteDocumentField:function(documentCup){var f0=document.getElementById(documentCup);f0.parentNode.removeChild(f0);},deleteTemplateAttachmentField:function(idx,index){var r=document.getElementById("templateAttachmentsRemove"+idx).value;if(r!=""){r+="::";}
 r+=document.getElementById('templateAttachmentId'+idx+index).value;document.getElementById("templateAttachmentsRemove"+idx).value=r;var target='templateAttachmentCup'+idx+index;d=document.getElementById(target);d.parentNode.removeChild(d);},deleteUploadAttachment:function(index,file){var d=document.getElementById('email_attachment_bucket'+index);d.parentNode.removeChild(d);AjaxObject.target='';AjaxObject.startRequest('',urlStandard+"&emailUIAction=removeUploadedAttachment&file="+unescape(file));},addTemplateAttachmentField:function(idx){document.getElementById('templateAttachmentsTitle'+idx).style.display='block';var basket=document.getElementById('addedTemplateAttachments'+idx);if(basket){var index=basket.childNodes.length;if(index<0)
 index=0;}else{index=0;}
 var out="<div id='templateAttachmentCup"+idx+index+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=minus.gif' "+"style='cursor:pointer' align='absmiddle' onclick='SUGAR.email2.composeLayout.deleteTemplateAttachmentField(\""+
 idx+"\",\""+index+"\");'/>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=attachment.gif' "+"align='absmiddle' />"+"<input type='hidden' value='"+"' name='templateAttachment"+idx+index+"' id='templateAttachment"+idx+index+"' />"+"<input type='hidden' value='"+"' name='templateAttachmentId"+idx+index+"' id='templateAttachmentId"+idx+index+"' />"+"<span id='templateAttachmentName"+idx+index+"'"+">&nbsp;</span>"+"<br id='br"+index+"></br>"+"<br id='brdoc"+index+"></br>"+"</div>";basket.innerHTML=basket.innerHTML+out;return index;},sendEmail:function(idx,isDraft){var obAccountID=document.getElementById('addressFrom'+idx).value;if(typeof(SUGAR.email2.composeLayout.outboundAccountErrors[obAccountID])!='undefined')
 {SUGAR.showMessageBox(app_strings.LBL_EMAIL_ERROR_DESC,SUGAR.email2.composeLayout.outboundAccountErrors[obAccountID],'alert');return false;}
-var form=document.getElementById('emailCompose'+idx);var composeOptionsFormName="composeOptionsForm"+idx;var t=SE.util.getTiny(SE.tinyInstances.currentHtmleditor);if(t!=null||typeof(t)!="undefined"){var html=t.getContent();}else{var html="<p>"+document.getElementById('htmleditor'+idx).value+"</p>";}
+var form=document.getElementById('emailCompose'+idx);var composeOptionsFormName="composeOptionsForm"+idx;var t=SE.util.getTiny('htmleditor'+idx);if(t!=null||typeof(t)!="undefined"){var html=t.getContent();}else{var html="<p>"+document.getElementById('htmleditor'+idx).value+"</p>";}
 var subj=document.getElementById('emailSubject'+idx).value;var to=trim(document.getElementById('addressTO'+idx).value);var cc=trim(document.getElementById('addressCC'+idx).value);var bcc=trim(document.getElementById('addressBCC'+idx).value);var email_id=document.getElementById('email_id'+idx).value;var composeType=document.getElementById('composeType').value;var parent_type=document.getElementById("parent_type").value;var parent_id=document.getElementById("parent_id").value;var el_uid=document.getElementById("uid");var uid=(el_uid==null)?'':el_uid.value;var el_ieId=document.getElementById("ieId");var ieId=(el_ieId==null)?'':el_ieId.value;var el_mbox=document.getElementById("mbox");var mbox=(el_mbox==null)?'':el_mbox.value;if(!isValidEmail(to)||!isValidEmail(cc)||!isValidEmail(bcc)){alert(app_strings.LBL_EMAIL_COMPOSE_INVALID_ADDRESS);return false;}
 if(!SE.composeLayout.isParentTypeAndNameValid(idx)){return;}
 var parentTypeValue=document.getElementById('data_parent_type'+idx).value;var parentIdValue=document.getElementById('data_parent_id'+idx).value;parent_id=parentIdValue;parent_type=parentTypeValue;var in_draft=(document.getElementById('type'+idx).value=='draft')?true:false;if(to==""&&cc==''&&bcc==''&&!isDraft){alert(app_strings.LBL_EMAIL_COMPOSE_ERR_NO_RECIPIENTS);return false;}else if(subj==''&&!isDraft){if(!confirm(app_strings.LBL_EMAIL_COMPOSE_NO_SUBJECT)){return false;}else{subj=app_strings.LBL_EMAIL_COMPOSE_NO_SUBJECT_LITERAL;}}else if(html==''&&!isDraft){if(!confirm(app_strings.LBL_EMAIL_COMPOSE_NO_BODY)){return false;}}
@@ -989,7 +989,8 @@ this.dragId=id;this.targetNode=node;SUGAR.email2.folders.unhighliteAll();node.hi
 
 function complexLayoutInit(){var se=SUGAR.email2;var Dom=YAHOO.util.Dom;se.e2Layout={getInnerLayout:function(rows){se.listViewLayout=new YAHOO.widget.Layout('listViewDiv',{parent:se.complexLayout,border:true,hideOnLayout:true,height:400,units:[{position:"center",scroll:false,split:true,body:"<div id='emailGrid'></div><div id='dt-pag-nav'></div> "},{position:"bottom",scroll:true,collapse:false,resize:true,useShim:true,height:'250',body:"<div id='listBottom' />"},{position:"right",scroll:true,collapse:false,resize:true,useShim:true,width:'250',body:"<div id='listRight' />",titlebar:false}]});se.complexLayout.on("render",function(){var height=SUGAR.email2.innerLayout.get("element").clientHeight-30;SUGAR.email2.innerLayout.get("activeTab").get("contentEl").parentNode.style.height=height+"px";SUGAR.email2.listViewLayout.set("height",height);SUGAR.email2.listViewLayout.render();});se.listViewLayout.render();se.listViewLayout.get("element").parentNode.parentNode.style.padding="0px"
 var rp=se.listViewLayout.resizePreview=function(){var pre=Dom.get("displayEmailFramePreview");if(pre){var parent=Dom.getAncestorByClassName(pre,"yui-layout-bd");pre.style.height=(parent.clientHeight-pre.offsetTop)+"px";}};se.listViewLayout.getUnitByPosition("bottom").on("heightChange",se.autoSetLayout);se.listViewLayout.getUnitByPosition("right").on("endResize",se.autoSetLayout);se.e2Layout.setPreviewPanel(rows);se.previewLayout=se.listViewLayout;return se.listViewLayout;},getInnerLayout2Rows:function(){return this.getInnerLayout(true);},getInnerLayout2Columns:function(){return this.getInnerLayout(false);},init:function(){var viewHeight=document.documentElement?document.documentElement.clientHeight:self.innerHeight;var heightOffset=$('#dcmenu').length>0?$('#dcmenu').height():$('#header').height();se.complexLayout=new YAHOO.widget.Layout("container",{border:true,hideOnLayout:true,height:Dom.getViewportHeight()-heightOffset-65,width:Dom.getViewportWidth()-40,units:[{position:"center",scroll:false,body:"<div id='emailtabs'></div>"},{position:"left",scroll:true,body:"<div id='lefttabs'></div>",collapse:true,width:210,minWidth:100,resize:true,useShim:true,titlebar:true,header:"&nbsp;"},{header:Dom.get('footerLinks').innerHTML,position:'bottom',id:'mbfooter',height:22,border:false}]});se.complexLayout.render();var tp=se.innerLayout=new YAHOO.widget.TabView("emailtabs");tp.addTab(new YAHOO.widget.Tab({label:"Inbox",scroll:true,content:"<div id='listViewDiv'/>",id:"center",active:true}));var centerEl=se.complexLayout.getUnitByPosition('center').get('wrap');tp.appendTo(centerEl);tp.get("element").style.borderRight="1px solid #666"
-var listV=this.getInnerLayout2Rows();listV.set("height",tp.get("element").clientHeight-25);listV.render();se.leftTabs=new YAHOO.widget.TabView("lefttabs");var folderTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_FOLDERS_SHORT,scroll:true,content:"<div id='emailtree'/>",id:"tree",active:true});folderTab.on("activeChange",function(o){if(o.newValue){se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_FOLDERS);}});se.leftTabs.addTab(folderTab);var tabContent=SUGAR.util.getAndRemove("searchTab");var searchTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_SEARCH_SHORT,scroll:true,content:tabContent.innerHTML,id:tabContent.id});searchTab.on("activeChange",function(o){if(o.newValue)
+var listV=this.getInnerLayout2Rows();listV.set("height",tp.get("element").clientHeight-25);listV.render();tp.on("activeTabChange",function()
+{se.complexLayout.resize();});se.leftTabs=new YAHOO.widget.TabView("lefttabs");var folderTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_FOLDERS_SHORT,scroll:true,content:"<div id='emailtree'/>",id:"tree",active:true});folderTab.on("activeChange",function(o){if(o.newValue){se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_FOLDERS);}});se.leftTabs.addTab(folderTab);var tabContent=SUGAR.util.getAndRemove("searchTab");var searchTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_SEARCH_SHORT,scroll:true,content:tabContent.innerHTML,id:tabContent.id});searchTab.on("activeChange",function(o){if(o.newValue)
 {se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_SEARCH);Calendar.setup({inputField:"searchDateFrom",ifFormat:calFormat,showsTime:false,button:"searchDateFrom_trigger",singleClick:true,step:1,weekNumbers:false});Calendar.setup({inputField:"searchDateTo",ifFormat:calFormat,showsTime:false,button:"searchDateTo_trigger",singleClick:true,step:1,weekNumbers:false});se.e2Layout.initSQSObject('advancedSearchForm','assigned_user_name');var parentSearchArgs={'formName':'advancedSearchForm','fieldName':'data_parent_name_search','moduleSelectField':'data_parent_type_search','fieldId':'data_parent_id_search'};YAHOO.util.Event.addListener('data_parent_type_search','change',function(){SUGAR.email2.composeLayout.enableQuickSearchRelate(null,parentSearchArgs)});var addKeyPressFields=['searchSubject','searchFrom','searchTo','data_parent_name_search','searchDateTo','searchDateFrom','attachmentsSearch','assigned_user_name'];for(var i=0;i<addKeyPressFields.length;i++)
 {YAHOO.util.Event.addListener(window.document.forms['advancedSearchForm'].elements[addKeyPressFields[i]],"keydown",function(e){if(e.keyCode==13){YAHOO.util.Event.stopEvent(e);SUGAR.email2.search.searchAdvanced();}});}
 enableQS(true);YAHOO.util.Event.addListener('data_parent_type_search','change',function(){document.getElementById('data_parent_id_search').value='';document.getElementById('data_parent_name_search').value='';});}});se.leftTabs.addTab(searchTab);var resizeTabBody=function(){var height=SUGAR.email2.leftTabs.get("element").clientHeight-30;SUGAR.email2.leftTabs.get("activeTab").get("contentEl").parentNode.style.height=height+"px";}
@@ -1002,7 +1003,7 @@ QSProcessedFieldsArray[fullFieldName]=false;if(Dom.get(resultName))
 var myBufferedListenerObject=new Object();myBufferedListenerObject.refit=function(){if(SUGAR.email2.grid){SUGAR.email2.grid.autoSize();}}/* End of File modules/Emails/javascript/complexLayout.js */
 
 
-SUGAR.email2.templates['compose']='<div id="composeLayout{idx}" class="ylayout-inactive-content"></div>'+'<div id="composeOverFrame{idx}" style="height:100%;width:100%">'+' <form id="emailCompose{idx}" name="ComposeEditView{idx}" action="index.php" method="POST">'+'  <input type="hidden" id="email_id{idx}" name="email_id" value="">'+'  <input type="hidden" id="uid{idx}" name="uid" value="">'+'  <input type="hidden" id="ieId{idx}" name="ieId" value="">'+'  <input type="hidden" id="mbox{idx}" name="mbox" value="">'+'  <input type="hidden" id="type{idx}" name="type" value="">'+'  <input type="hidden" id="composeLayoutId" name="composeLayoutId" value="shouldNotSeeMe">'+'  <input type="hidden" id="composeType" name="composeType">'+'  <input type="hidden" id="fromAccount" name="fromAccount">'+'  <input type="hidden" id="sendSubject" name="sendSubject">'+'  <input type="hidden" id="sendDescription" name="sendDescription">'+'  <input type="hidden" id="sendTo" name="sendTo">'+'  <input type="hidden" id="sendBcc" name="sendBcc">'+'  <input type="hidden" id="sendCc" name="sendCc">'+'  <input type="hidden" id="setEditor" name="setEditor">'+'  <input type="hidden" id="saveToSugar" name="saveToSugar">'+'  <input type="hidden" id="parent_id" name="parent_id">'+'  <input type="hidden" id="parent_type" name="parent_type">'+'  <input type="hidden" id="attachments" name="attachments">'+'  <input type="hidden" id="documents" name="documents">'+'  <input type="hidden" id="outbound_email{idx}" name="outbound_email">'+'  <input type="hidden" id="templateAttachments" name="templateAttachments">'+'  <input type="hidden" id="templateAttachmentsRemove{idx}" name="templateAttachmentsRemove">'+'  <table id="composeHeaderTable{idx}" cellpadding="0" cellspacing="0" border="0" width="100%" class="list">'+'   <tr>'+'    <th><table cellpadding="0" cellspacing="0" border="0"><tbody><tr ><td style="padding: 0px !important;margin:0px; !important" >'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.sendEmail({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_send.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SEND}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.saveDraft({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_save.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SAVE_DRAFT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showAttachmentPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_attach.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_ATTACHMENT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showOptionsPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_options.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_OPTIONS}</button>'+'</td><td style="padding: 0px !important;margin:0px; !important">&nbsp;&nbsp;{mod_strings.LBL_EMAIL_RELATE}:&nbsp;&nbsp;<select class="select" id="data_parent_type{idx}" onchange="document.getElementById(\'data_parent_name{idx}\').value=\'\';document.getElementById(\'data_parent_id{idx}\').value=\'\'; SUGAR.email2.composeLayout.enableQuickSearchRelate(\'{idx}\');" name="data_parent_type{idx}">{linkbeans_options}</select>'+'&nbsp;</td><td style="padding: 0px !important;margin:0px; !important"><input id="data_parent_id{idx}" name="data_parent_id{idx}" type="hidden" value="">'+'<input class="sqsEnabled" id="data_parent_name{idx}" name="data_parent_name{idx}" type="text" value="">&nbsp;<button type="button" class="button" onclick="SUGAR.email2.composeLayout.callopenpopupForEmail2({idx});"><img src="index.php?entryPoint=getImage&themeName=default&imageName=id-ff-select.png" align="absmiddle" border="0"></button>'+'   </td></tr></tbody></table></th>'+'   </tr>'+'   <tr>'+'    <td>'+'     <div style="margin:5px;">'+'     <table cellpadding="4" cellspacing="0" border="0" width="100%">'+'      <tr>'+'       <td class="emailUILabel" NOWRAP >'+'        <label for="addressFrom{idx}">{app_strings.LBL_EMAIL_FROM}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div>'+'         &nbsp;&nbsp;<select style="width: 500px;" class="ac_input" id="addressFrom{idx}" name="addressFrom{idx}"></select>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP>'+'        <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressTO{idx}\')">'+'                                   {app_strings.LBL_EMAIL_TO}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressTO{idx}" title="{app_strings.LBL_EMAIL_TO}" name="addressTO{idx}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressTO{idx}" href="#" style="display: none;">+<span id="DetailaddressTO{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressToAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr id="add_addr_options_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>&nbsp;</td><td class="emailUIField" valign="top" NOWRAP>&nbsp;&nbsp;<span id="cc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'cc\',\'{idx}\');">{mod_strings.LBL_ADD_CC}</a></span><span id="bcc_cc_sep{idx}">&nbsp;{mod_strings.LBL_ADD_CC_BCC_SEP}&nbsp;</span><span id="bcc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'bcc\',\'{idx}\');">{mod_strings.LBL_ADD_BCC}</a></span></td>'+'      </tr>'+'      <tr class="yui-hidden" id="cc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressCC{idx}\')">'+'        {app_strings.LBL_EMAIL_CC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressCC{idx}" name="addressCC{idx}"   title="{app_strings.LBL_EMAIL_CC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressCC{idx}" href="#"  style="display: none;">+<span id="DetailaddressCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressCcAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr class="yui-hidden" id="bcc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressBCC{idx}\')">'+'                               {app_strings.LBL_EMAIL_BCC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressBCC{idx}" name="addressBCC{idx}" title="{app_strings.LBL_EMAIL_BCC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressBCC{idx}" href="#" style="display: none;">+<span id="DetailaddressBCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressBccAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP width="1%">'+'        <label for="emailSubject{idx}">{app_strings.LBL_EMAIL_SUBJECT}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP width="99%">'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="">'+'        </div>'+'       </td>'+'      </tr>'+'     </table>'+'     </div>'+'    </td>'+'   </tr>'+'  </table>'+'  <textarea id="htmleditor{idx}" name="htmleditor{idx}" style="width:100%; height: 100px;"></textarea>'+'  <div id="divAttachments{idx}" class="ylayout-inactive-content">'+'   <div style="padding:5px;">'+'    <table cellpadding="2" cellspacing="0" border="0">'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_file_button" onclick="SUGAR.email2.composeLayout.addFileField();" value="{mod_strings.LBL_ADD_FILE}" class="button" />'+'       <div id="addedFiles{idx}" name="addedFiles{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS2}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_document_button" onclick="SUGAR.email2.composeLayout.addDocumentField({idx});" value="{mod_strings.LBL_ADD_DOCUMENT}" class="button" />'+'       <div id="addedDocuments{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <div id="templateAttachmentsTitle{idx}" style="display:none"><b>{app_strings.LBL_EMAIL_ATTACHMENTS3}</b></div>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <div id="addedTemplateAttachments{idx}"></div>'+'      </td>'+'     </tr>'+'    </table>'+'   </div>'+'  </div>'+' </form>'+'  <div id="divOptions{idx}" class="ylayout-inactive-content"'+'             <div style="padding:5px;">'+'   <form name="composeOptionsForm{idx}" id="composeOptionsForm{idx}">'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_TEMPLATES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="email_template{idx}" id="email_template{idx}"  onchange="SUGAR.email2.composeLayout.applyEmailTemplate(\'{idx}\', this.options[this.selectedIndex].value);"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <br />'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_SIGNATURES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="signatures{idx}" id="signatures{idx}" onchange="SUGAR.email2.composeLayout.setSignature(\'{idx}\');"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <input type="checkbox" id="setEditor{idx}" name="setEditor{idx}" value="1" onclick="SUGAR.email2.composeLayout.renderTinyMCEToolBar(\'{idx}\', this.checked);"/>&nbsp;'+'       <b>{mod_strings.LBL_SEND_IN_PLAIN_TEXT}</b>'+'      </td>'+'     </tr>'+'    </table>'+'         </form>'+'   </div> '+'  </div>'+'</div>';/* End of File modules/Emails/javascript/composeEmailTemplate.js */
+SUGAR.email2.templates['compose']='<div id="composeLayout{idx}" class="ylayout-inactive-content"></div>'+'<div id="composeOverFrame{idx}" style="height:100%;width:100%">'+' <form id="emailCompose{idx}" name="ComposeEditView{idx}" action="index.php" method="POST">'+'  <input type="hidden" id="email_id{idx}" name="email_id" value="">'+'  <input type="hidden" id="uid{idx}" name="uid" value="">'+'  <input type="hidden" id="ieId{idx}" name="ieId" value="">'+'  <input type="hidden" id="mbox{idx}" name="mbox" value="">'+'  <input type="hidden" id="type{idx}" name="type" value="">'+'  <input type="hidden" id="composeLayoutId" name="composeLayoutId" value="shouldNotSeeMe">'+'  <input type="hidden" id="composeType" name="composeType">'+'  <input type="hidden" id="fromAccount" name="fromAccount">'+'  <input type="hidden" id="sendSubject" name="sendSubject">'+'  <input type="hidden" id="sendDescription" name="sendDescription">'+'  <input type="hidden" id="sendTo" name="sendTo">'+'  <input type="hidden" id="sendBcc" name="sendBcc">'+'  <input type="hidden" id="sendCc" name="sendCc">'+'  <input type="hidden" id="setEditor" name="setEditor">'+'  <input type="hidden" id="saveToSugar" name="saveToSugar">'+'  <input type="hidden" id="parent_id" name="parent_id">'+'  <input type="hidden" id="parent_type" name="parent_type">'+'  <input type="hidden" id="attachments" name="attachments">'+'  <input type="hidden" id="documents" name="documents">'+'  <input type="hidden" id="outbound_email{idx}" name="outbound_email">'+'  <input type="hidden" id="templateAttachments" name="templateAttachments">'+'  <input type="hidden" id="templateAttachmentsRemove{idx}" name="templateAttachmentsRemove">'+'  <table id="composeHeaderTable{idx}" cellpadding="0" cellspacing="0" border="0" width="100%" class="list">'+'   <tr>'+'    <th><table cellpadding="0" cellspacing="0" border="0"><tbody><tr ><td style="padding: 0px !important;margin:0px; !important" >'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.sendEmail({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_send.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SEND}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.saveDraft({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_save.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SAVE_DRAFT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showAttachmentPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_attach.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_ATTACHMENT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showOptionsPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_options.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_OPTIONS}</button>'+'</td><td style="padding: 0px !important;margin:0px; !important">&nbsp;&nbsp;{mod_strings.LBL_EMAIL_RELATE}:&nbsp;&nbsp;<select class="select" id="data_parent_type{idx}" onchange="document.getElementById(\'data_parent_name{idx}\').value=\'\';document.getElementById(\'data_parent_id{idx}\').value=\'\'; SUGAR.email2.composeLayout.enableQuickSearchRelate(\'{idx}\');" name="data_parent_type{idx}">{linkbeans_options}</select>'+'&nbsp;</td><td style="padding: 0px !important;margin:0px; !important"><input id="data_parent_id{idx}" name="data_parent_id{idx}" type="hidden" value="">'+'<input class="sqsEnabled" id="data_parent_name{idx}" name="data_parent_name{idx}" type="text" value="">&nbsp;<button type="button" class="button" onclick="SUGAR.email2.composeLayout.callopenpopupForEmail2({idx});"><img src="index.php?entryPoint=getImage&themeName=default&imageName=id-ff-select.png" align="absmiddle" border="0"></button>'+'   </td></tr></tbody></table></th>'+'   </tr>'+'   <tr>'+'    <td>'+'     <div style="margin:5px;">'+'     <table cellpadding="4" cellspacing="0" border="0" width="100%">'+'      <tr>'+'       <td class="emailUILabel" NOWRAP >'+'        <label for="addressFrom{idx}">{app_strings.LBL_EMAIL_FROM}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div>'+'         &nbsp;&nbsp;<select style="width: 500px;" class="ac_input" id="addressFrom{idx}" name="addressFrom{idx}"></select>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP>'+'        <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressTO{idx}\')">'+'                                   {app_strings.LBL_EMAIL_TO}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressTO{idx}" title="{app_strings.LBL_EMAIL_TO}" name="addressTO{idx}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressTO{idx}" href="#" style="display: none;">+<span id="DetailaddressTO{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressToAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr id="add_addr_options_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>&nbsp;</td><td class="emailUIField" valign="top" NOWRAP>&nbsp;&nbsp;<span id="cc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'cc\',\'{idx}\');">{mod_strings.LBL_ADD_CC}</a></span><span id="bcc_cc_sep{idx}">&nbsp;{mod_strings.LBL_ADD_CC_BCC_SEP}&nbsp;</span><span id="bcc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'bcc\',\'{idx}\');">{mod_strings.LBL_ADD_BCC}</a></span></td>'+'      </tr>'+'      <tr class="yui-hidden" id="cc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressCC{idx}\')">'+'        {app_strings.LBL_EMAIL_CC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressCC{idx}" name="addressCC{idx}"   title="{app_strings.LBL_EMAIL_CC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressCC{idx}" href="#"  style="display: none;">+<span id="DetailaddressCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressCcAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr class="yui-hidden" id="bcc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressBCC{idx}\')">'+'                               {app_strings.LBL_EMAIL_BCC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressBCC{idx}" name="addressBCC{idx}" title="{app_strings.LBL_EMAIL_BCC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressBCC{idx}" href="#" style="display: none;">+<span id="DetailaddressBCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressBccAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP width="1%">'+'        <label for="emailSubject{idx}">{app_strings.LBL_EMAIL_SUBJECT}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP width="99%">'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="" maxlength="'+SUGAR.email2.composeLayout.subjectMaxlen+'">'+'        </div>'+'       </td>'+'      </tr>'+'     </table>'+'     </div>'+'    </td>'+'   </tr>'+'  </table>'+'  <textarea id="htmleditor{idx}" name="htmleditor{idx}" style="width:100%; height: 100px;"></textarea>'+'  <div id="divAttachments{idx}" class="ylayout-inactive-content">'+'   <div style="padding:5px;">'+'    <table cellpadding="2" cellspacing="0" border="0">'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_file_button" onclick="SUGAR.email2.composeLayout.addFileField();" value="{mod_strings.LBL_ADD_FILE}" class="button" />'+'       <div id="addedFiles{idx}" name="addedFiles{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS2}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_document_button" onclick="SUGAR.email2.composeLayout.addDocumentField({idx});" value="{mod_strings.LBL_ADD_DOCUMENT}" class="button" />'+'       <div id="addedDocuments{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <div id="templateAttachmentsTitle{idx}" style="display:none"><b>{app_strings.LBL_EMAIL_ATTACHMENTS3}</b></div>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <div id="addedTemplateAttachments{idx}"></div>'+'      </td>'+'     </tr>'+'    </table>'+'   </div>'+'  </div>'+' </form>'+'  <div id="divOptions{idx}" class="ylayout-inactive-content"'+'             <div style="padding:5px;">'+'   <form name="composeOptionsForm{idx}" id="composeOptionsForm{idx}">'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_TEMPLATES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="email_template{idx}" id="email_template{idx}"  onchange="SUGAR.email2.composeLayout.applyEmailTemplate(\'{idx}\', this.options[this.selectedIndex].value);"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <br />'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_SIGNATURES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="signatures{idx}" id="signatures{idx}" onchange="SUGAR.email2.composeLayout.setSignature(\'{idx}\');"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <input type="checkbox" id="setEditor{idx}" name="setEditor{idx}" value="1" onclick="SUGAR.email2.composeLayout.renderTinyMCEToolBar(\'{idx}\', this.checked);"/>&nbsp;'+'       <b>{mod_strings.LBL_SEND_IN_PLAIN_TEXT}</b>'+'      </td>'+'     </tr>'+'    </table>'+'         </form>'+'   </div> '+'  </div>'+'</div>';/* End of File modules/Emails/javascript/composeEmailTemplate.js */
 
 
 SUGAR.email2.templates['displayOneEmail']='<div class="emailDetailTable" style="height:100%">'+'<div id="viewMenuDiv{idx}"></div>'+'<div width="100%" class="displayEmailValue">'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.c0_replyForwardEmail(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\', \'reply\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_reply.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_REPLY}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.c0_replyForwardEmail(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\', \'replyAll\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_replyall.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_REPLY_ALL}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.c0_replyForwardEmail(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\', \'forward\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_forward.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_FORWARD}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.detailView.emailDeleteSingle(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_delete.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_DELETE}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.detailView.viewPrintable(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=Print_Email.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_PRINT}</button>'+'     <button id="btnEmailView{idx}" type="button" class="button" onclick="SUGAR.email2.detailView.showViewMenu(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_view.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_VIEW} <img src="themes/default/images/more.gif" align="absmiddle" border="0"></button>'+'     <button id="archiveEmail{idx}" type="button" class="button" onclick="SUGAR.email2.detailView.importEmail(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="themes/default/images/icon_email_archive.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_IMPORT_EMAIL}</button>'+'     <button id="quickCreateSpan{meta.panelId}" type="button" class="button" onclick="SUGAR.email2.detailView.showQuickCreate(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="themes/default/images/icon_email_create.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_QUICK_CREATE} <img src="themes/default/images/more.gif" align="absmiddle" border="0"></button>'+'     <button type="button" id="showDeialViewForEmail{meta.panelId}" class="button" onclick="SUGAR.email2.contextMenus.showEmailDetailViewInPopup(\'{meta.ieId}\', \'{meta.uid}\', \'{meta.mbox}\');"><img src="themes/default/images/icon_email_relate.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_VIEW_RELATIONSHIPS}</button>'+'</div>'+'   <table cellpadding="0" cellspacing="0" border="0" width="100%" >'+'    <tr>'+'     <td NOWRAP valign="top" width="1%" class="displayEmailLabel">'+'      {app_strings.LBL_EMAIL_FROM}:'+'     </td>'+'     <td width="99%" class="displayEmailValue">'+'      {email.from_addr}'+'     </td>'+'    </tr>'+'    <tr>'+'     <td NOWRAP valign="top" class="displayEmailLabel">'+'      {app_strings.LBL_EMAIL_SUBJECT}:'+'     </td>'+'     <td NOWRAP valign="top" class="displayEmailValue">'+'      <b>{email.name}</b>'+'     </td>'+'    </tr>'+'    <tr>'+'     <td NOWRAP valign="top" class="displayEmailLabel">'+'      {app_strings.LBL_EMAIL_DATE_SENT_BY_SENDER}:'+'     </td>'+'     <td class="displayEmailValue">'+'      {email.date_start} {email.time_start}'+'     </td>'+'    </tr>'+'    <tr>'+'     <td NOWRAP valign="top" class="displayEmailLabel">'+'      {app_strings.LBL_EMAIL_TO}:'+'     </td>'+'     <td class="displayEmailValue">'+'      {email.toaddrs}'+'     </td>'+'    </tr>'+'    <tr>{meta.cc}</tr>'+'    <tr>{email.attachments}</tr>'+'   </table>'+'   <div id="displayEmailFrameDiv{idx}" name="displayEmailFrameDiv{idx}"><iframe id="displayEmailFrame{idx}" src="modules/Emails/templates/_blank.html" width="100%" height="100%" frameborder="0"></iframe></div>'+'</div>';/* End of File modules/Emails/javascript/displayOneEmailTemplate.js */
diff --git a/cache/include/javascript/sugar_grp_jsolait.js b/cache/include/javascript/sugar_grp_jsolait.js
index 2fe8f0b1..97d0a11a 100644
--- a/cache/include/javascript/sugar_grp_jsolait.js
+++ b/cache/include/javascript/sugar_grp_jsolait.js
@@ -33,7 +33,8 @@ function method_callback(o){var resp=YAHOO.lang.JSON.parse(o.responseText),reque
 reqid=global_request_registry[request_id];if(typeof(reqid)!='undefined'){widget=global_request_registry[request_id][0];method_name=global_request_registry[request_id][1];widget[method_name](result);}}
 SugarClass.inherit("SugarVCalClient","SugarClass");function SugarVCalClient(){this.init();}
 SugarVCalClient.prototype.init=function(){}
-SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;YAHOO.util.Connect.asyncRequest('GET','./vcal_server.php?type=vfb&source=outlook&user_id='+user_id,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
+SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;var vcal_server='./vcal_server.php?type=vfb&source=outlook&user_id='+user_id;if(typeof(window.combo_date_start)!='undefined'){var date_start=window.combo_date_start.datetime;vcal_server+='&datestart='+date_start;}
+YAHOO.util.Connect.asyncRequest('GET',vcal_server,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
 if(typeof GLOBAL_REGISTRY.freebusy_adjusted=='undefined'){GLOBAL_REGISTRY.freebusy_adjusted=new Object();}
 GLOBAL_REGISTRY.freebusy[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,false);GLOBAL_REGISTRY.freebusy_adjusted[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,true);global_request_registry[request_id][0].display();},failure:function(result){this.success(result);},argument:{result:result}});}
 SugarVCalClient.prototype.parseResults=function(textResult,adjusted){var match=/FREEBUSY.*?\:([\w]+)\/([\w]+)/g;var result;var timehash=new Object();var dst_start;var dst_end;if(GLOBAL_REGISTRY.current_user.fields.dst_start==null)
diff --git a/cache/include/javascript/sugar_grp_quickcomp.js b/cache/include/javascript/sugar_grp_quickcomp.js
index 2dafb683..5670ede7 100644
--- a/cache/include/javascript/sugar_grp_quickcomp.js
+++ b/cache/include/javascript/sugar_grp_quickcomp.js
@@ -33,7 +33,8 @@ function method_callback(o){var resp=YAHOO.lang.JSON.parse(o.responseText),reque
 reqid=global_request_registry[request_id];if(typeof(reqid)!='undefined'){widget=global_request_registry[request_id][0];method_name=global_request_registry[request_id][1];widget[method_name](result);}}
 SugarClass.inherit("SugarVCalClient","SugarClass");function SugarVCalClient(){this.init();}
 SugarVCalClient.prototype.init=function(){}
-SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;YAHOO.util.Connect.asyncRequest('GET','./vcal_server.php?type=vfb&source=outlook&user_id='+user_id,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
+SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;var vcal_server='./vcal_server.php?type=vfb&source=outlook&user_id='+user_id;if(typeof(window.combo_date_start)!='undefined'){var date_start=window.combo_date_start.datetime;vcal_server+='&datestart='+date_start;}
+YAHOO.util.Connect.asyncRequest('GET',vcal_server,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
 if(typeof GLOBAL_REGISTRY.freebusy_adjusted=='undefined'){GLOBAL_REGISTRY.freebusy_adjusted=new Object();}
 GLOBAL_REGISTRY.freebusy[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,false);GLOBAL_REGISTRY.freebusy_adjusted[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,true);global_request_registry[request_id][0].display();},failure:function(result){this.success(result);},argument:{result:result}});}
 SugarVCalClient.prototype.parseResults=function(textResult,adjusted){var match=/FREEBUSY.*?\:([\w]+)\/([\w]+)/g;var result;var timehash=new Object();var dst_start;var dst_end;if(GLOBAL_REGISTRY.current_user.fields.dst_start==null)
@@ -316,7 +317,7 @@ return address;},init:function(idx){var ds=new YAHOO.widget.DS_JSArray(this.retu
 SE.autoComplete.instances[idx]['to'].dataSource.data=refresh;SE.autoComplete.instances[idx]['cc'].dataSource.data=refresh;SE.autoComplete.instances[idx]['bcc'].dataSource.data=refresh;},returnDataSource:function(contacts){var ret=new Array();for(var id in contacts){if(contacts[id].name){var primary=this.getPrimaryAddress(contacts[id]);ret[ret.length]=contacts[id].name.replace(/<[\/]*b>/gi,'')+" <"+primary+">";for(var emailIndex in contacts[id].email){ret[ret.length]=contacts[id].email[emailIndex].email_address;}}}
 return ret;},toggleTextareaHide:function(sType,aArgs){var textBoxId=aArgs[0]._oTextbox.id;var type="";var idx=-1;if(textBoxId.indexOf("addressTO")>-1){type="to";}else if(textBoxId.indexOf("addressCC")>-1){type="cc";}
 idx=textBoxId.substr(9);if(type!=""){var cc=document.getElementById("addressCC"+idx);var bcc=document.getElementById("addressBCC"+idx);switch(type){case"to":cc.style.visibility='hidden';case"cc":bcc.style.visibility='hidden';break;}}},toggleTextareaShow:function(sType,aArgs){var textBoxId=aArgs[0]._oTextbox.id;var type="";var idx=-1;if(textBoxId.indexOf("addressTO")>-1){type="to";}else if(textBoxId.indexOf("addressCC")>-1){type="cc";}
-idx=textBoxId.substr(9);if(type!=""){document.getElementById("addressCC"+idx).style.visibility='visible';document.getElementById("addressBCC"+idx).style.visibility='visible';}}};SE.composeLayout={currentInstanceId:0,ccHidden:true,bccHidden:true,outboundAccountErrors:null,loadedTinyInstances:{},showAddressDetails:function(e){var linkElement=document.getElementById("More"+e.id);var spanElement=document.getElementById("Detail"+e.id);var emailAddressList=e.value;if(e.value.length>96)
+idx=textBoxId.substr(9);if(type!=""){document.getElementById("addressCC"+idx).style.visibility='visible';document.getElementById("addressBCC"+idx).style.visibility='visible';}}};SE.composeLayout={currentInstanceId:0,ccHidden:true,bccHidden:true,outboundAccountErrors:null,loadedTinyInstances:{},subjectMaxlen:255,showAddressDetails:function(e){var linkElement=document.getElementById("More"+e.id);var spanElement=document.getElementById("Detail"+e.id);var emailAddressList=e.value;if(e.value.length>96)
 {var resultArray=SE.composeLayout._getEmailArrayFromString(emailAddressList);var displayArray=[];for(var i=0;i<resultArray.length;i++)
 {var t_name=resultArray[i].name;var t_emailAddr=resultArray[i].email_address;if(t_name=='')
 displayArray.push('<br/>&lt;'+t_emailAddr+'&gt;');else
@@ -392,14 +393,14 @@ else
 t.setContent(newHtml);}},prepareSignature:function(str){var signature=new String(str);signature=signature.replace(/&lt;/gi,'<');signature=signature.replace(/&gt;/gi,'>');return signature;},showAttachmentPanel:function(idx){var east=SE.composeLayout[idx].getUnitByPosition("right");var tabs=SE.composeLayout[idx].rightTabs;east.expand();tabs.set("activeTab",tabs.getTab(0));},showOptionsPanel:function(idx){var east=SE.composeLayout[idx].getUnitByPosition("right");var tabs=SE.composeLayout[idx].rightTabs;east.expand();tabs.set("activeTab",tabs.getTab(1));},showContactsPanel:function(){SE.complexLayout.regions.west.showPanel("contactsTab");},addDocumentField:function(idx){var basket=document.getElementById('addedDocuments'+idx);if(basket){var index=(basket.childNodes.length / 7)-1;if(index<0)
 index=0;}else{index=0;}
 var test=document.getElementById('documentId'+idx+index);while(test!=null){index++;test=document.getElementById('documentId'+idx+index);}
-var documentCup=document.createElement("div");documentCup.id='documentCup'+idx+index;documentCup.innerHTML="<input type='hidden' name='document"+idx+index+"' id='document"+idx+index+"' />"+"<input type='hidden' name='documentId"+idx+index+"' id='documentId"+idx+index+"' />"+"<input value='' size='15' disabled='true' type='text' name='documentName"+idx+index+"' id='documentName"+idx+index+"' />"+"<button class='button firstChild' type='button' name='documentSelect"+idx+index+"' id='documentSelect"+idx+index+"'"+"onclick='SE.composeLayout.selectDocument(\""+index+"\");' value='"+app_strings.LBL_EMAIL_SELECT+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-select.png' ></button>"+"<button class='button lastChild' type='button' name='documentRemove"+idx+index+"' id='documentRemove"+idx+index+"'"+"onclick='SE.composeLayout.deleteDocumentField(\"documentCup"+idx+index+"\");' value='"+app_strings.LBL_EMAIL_REMOVE+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-clear.png' ></button>"+"<br/>";basket.appendChild(documentCup);return index;},saveDraft:function(tinyInstance){this.sendEmail(tinyInstance,true);},selectDocument:function(target){URL="index.php?module=Emails&action=PopupDocuments&to_pdf=true&target="+target;windowName='selectDocument';windowFeatures='width=800'+',height=600'+',resizable=1,scrollbars=1';win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus){win.focus();}},addFileField:function(){if(!SE.addFileDialog){SE.addFileDialog=new YAHOO.widget.Dialog("addFileDialog",{modal:true,visible:false,fixedcenter:true,constraintoviewport:true,scroll:true,keylisteners:new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){SE.addFileDialog.hide();}})});SE.addFileDialog.setHeader(app_strings.LBL_EMAIL_ATTACHMENTS);SE.addFileDialog.render();}
+var documentCup=document.createElement("div");documentCup.id='documentCup'+idx+index;documentCup.innerHTML="<input type='hidden' name='document"+idx+index+"' id='document"+idx+index+"' />"+"<input type='hidden' name='documentId"+idx+index+"' id='documentId"+idx+index+"' />"+"<input value='' size='15' disabled='true' type='text' name='documentName"+idx+index+"' id='documentName"+idx+index+"' />"+"<button class='button firstChild' type='button' name='documentSelect"+idx+index+"' id='documentSelect"+idx+index+"'"+"onclick='SE.composeLayout.selectDocument(\""+index+"\");' value='"+app_strings.LBL_EMAIL_SELECT+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-select.png' ></button>"+"<button class='button lastChild' type='button' name='documentRemove"+idx+index+"' id='documentRemove"+idx+index+"'"+"onclick='SE.composeLayout.deleteDocumentField(\"documentCup"+idx+index+"\");' value='"+app_strings.LBL_EMAIL_REMOVE+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=id-ff-clear.png' ></button>"+"<br/>";basket.appendChild(documentCup);return index;},saveDraft:function(tinyInstance){SE.tinyInstances.currentHtmleditor='htmleditor'+tinyInstance;this.sendEmail(tinyInstance,true);},selectDocument:function(target){URL="index.php?module=Emails&action=PopupDocuments&to_pdf=true&target="+target;windowName='selectDocument';windowFeatures='width=800'+',height=600'+',resizable=1,scrollbars=1';win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus){win.focus();}},addFileField:function(){if(!SE.addFileDialog){SE.addFileDialog=new YAHOO.widget.Dialog("addFileDialog",{modal:true,visible:false,fixedcenter:true,constraintoviewport:true,scroll:true,keylisteners:new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){SE.addFileDialog.hide();}})});SE.addFileDialog.setHeader(app_strings.LBL_EMAIL_ATTACHMENTS);SE.addFileDialog.render();}
 Dom.removeClass("addFileDialog","yui-hidden");SE.addFileDialog.show();},uploadAttachment:function(){if(document.getElementById('email_attachment').value!=""){var formObject=document.getElementById('uploadAttachment');YAHOO.util.Connect.setForm(formObject,true,true);AjaxObject.target='';AjaxObject.startRequest(callbackUploadAttachment,null);}else{alert(app_strings.LBL_EMAIL_ERROR_NO_FILE);}},setDocument:function(idx,target,documentId,documentName,docRevId){var addedDocs=document.getElementById("addedDocuments"+idx);var docId=document.getElementById('documentId'+idx+target);var docName=document.getElementById('documentName'+idx+target);var docRevisionId=document.getElementById('document'+idx+target);docId.value=documentId;docName.value=documentName;docRevisionId.value=docRevId;},deleteDocumentField:function(documentCup){var f0=document.getElementById(documentCup);f0.parentNode.removeChild(f0);},deleteTemplateAttachmentField:function(idx,index){var r=document.getElementById("templateAttachmentsRemove"+idx).value;if(r!=""){r+="::";}
 r+=document.getElementById('templateAttachmentId'+idx+index).value;document.getElementById("templateAttachmentsRemove"+idx).value=r;var target='templateAttachmentCup'+idx+index;d=document.getElementById(target);d.parentNode.removeChild(d);},deleteUploadAttachment:function(index,file){var d=document.getElementById('email_attachment_bucket'+index);d.parentNode.removeChild(d);AjaxObject.target='';AjaxObject.startRequest('',urlStandard+"&emailUIAction=removeUploadedAttachment&file="+unescape(file));},addTemplateAttachmentField:function(idx){document.getElementById('templateAttachmentsTitle'+idx).style.display='block';var basket=document.getElementById('addedTemplateAttachments'+idx);if(basket){var index=basket.childNodes.length;if(index<0)
 index=0;}else{index=0;}
 var out="<div id='templateAttachmentCup"+idx+index+"'>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=minus.gif' "+"style='cursor:pointer' align='absmiddle' onclick='SUGAR.email2.composeLayout.deleteTemplateAttachmentField(\""+
 idx+"\",\""+index+"\");'/>"+"<img src='index.php?entryPoint=getImage&themeName="+SUGAR.themes.theme_name+"&imageName=attachment.gif' "+"align='absmiddle' />"+"<input type='hidden' value='"+"' name='templateAttachment"+idx+index+"' id='templateAttachment"+idx+index+"' />"+"<input type='hidden' value='"+"' name='templateAttachmentId"+idx+index+"' id='templateAttachmentId"+idx+index+"' />"+"<span id='templateAttachmentName"+idx+index+"'"+">&nbsp;</span>"+"<br id='br"+index+"></br>"+"<br id='brdoc"+index+"></br>"+"</div>";basket.innerHTML=basket.innerHTML+out;return index;},sendEmail:function(idx,isDraft){var obAccountID=document.getElementById('addressFrom'+idx).value;if(typeof(SUGAR.email2.composeLayout.outboundAccountErrors[obAccountID])!='undefined')
 {SUGAR.showMessageBox(app_strings.LBL_EMAIL_ERROR_DESC,SUGAR.email2.composeLayout.outboundAccountErrors[obAccountID],'alert');return false;}
-var form=document.getElementById('emailCompose'+idx);var composeOptionsFormName="composeOptionsForm"+idx;var t=SE.util.getTiny(SE.tinyInstances.currentHtmleditor);if(t!=null||typeof(t)!="undefined"){var html=t.getContent();}else{var html="<p>"+document.getElementById('htmleditor'+idx).value+"</p>";}
+var form=document.getElementById('emailCompose'+idx);var composeOptionsFormName="composeOptionsForm"+idx;var t=SE.util.getTiny('htmleditor'+idx);if(t!=null||typeof(t)!="undefined"){var html=t.getContent();}else{var html="<p>"+document.getElementById('htmleditor'+idx).value+"</p>";}
 var subj=document.getElementById('emailSubject'+idx).value;var to=trim(document.getElementById('addressTO'+idx).value);var cc=trim(document.getElementById('addressCC'+idx).value);var bcc=trim(document.getElementById('addressBCC'+idx).value);var email_id=document.getElementById('email_id'+idx).value;var composeType=document.getElementById('composeType').value;var parent_type=document.getElementById("parent_type").value;var parent_id=document.getElementById("parent_id").value;var el_uid=document.getElementById("uid");var uid=(el_uid==null)?'':el_uid.value;var el_ieId=document.getElementById("ieId");var ieId=(el_ieId==null)?'':el_ieId.value;var el_mbox=document.getElementById("mbox");var mbox=(el_mbox==null)?'':el_mbox.value;if(!isValidEmail(to)||!isValidEmail(cc)||!isValidEmail(bcc)){alert(app_strings.LBL_EMAIL_COMPOSE_INVALID_ADDRESS);return false;}
 if(!SE.composeLayout.isParentTypeAndNameValid(idx)){return;}
 var parentTypeValue=document.getElementById('data_parent_type'+idx).value;var parentIdValue=document.getElementById('data_parent_id'+idx).value;parent_id=parentIdValue;parent_type=parentTypeValue;var in_draft=(document.getElementById('type'+idx).value=='draft')?true:false;if(to==""&&cc==''&&bcc==''&&!isDraft){alert(app_strings.LBL_EMAIL_COMPOSE_ERR_NO_RECIPIENTS);return false;}else if(subj==''&&!isDraft){if(!confirm(app_strings.LBL_EMAIL_COMPOSE_NO_SUBJECT)){return false;}else{subj=app_strings.LBL_EMAIL_COMPOSE_NO_SUBJECT_LITERAL;}}else if(html==''&&!isDraft){if(!confirm(app_strings.LBL_EMAIL_COMPOSE_NO_BODY)){return false;}}
@@ -463,12 +464,13 @@ return searchChild;}
 return false;},cascadeNodes:function(parent,fn,scope,args){for(i in parent.children){var child=parent.children[i];var s=scope?scope:child;var a=args?args:child;fn.call(s,a);SE.util.cascadeNodes(child,fn,scope,args);}}};})();/* End of File modules/Emails/javascript/EmailUICompose.js */
 
 
-SUGAR.email2.templates['compose']='<div id="composeLayout{idx}" class="ylayout-inactive-content"></div>'+'<div id="composeOverFrame{idx}" style="height:100%;width:100%">'+' <form id="emailCompose{idx}" name="ComposeEditView{idx}" action="index.php" method="POST">'+'  <input type="hidden" id="email_id{idx}" name="email_id" value="">'+'  <input type="hidden" id="uid{idx}" name="uid" value="">'+'  <input type="hidden" id="ieId{idx}" name="ieId" value="">'+'  <input type="hidden" id="mbox{idx}" name="mbox" value="">'+'  <input type="hidden" id="type{idx}" name="type" value="">'+'  <input type="hidden" id="composeLayoutId" name="composeLayoutId" value="shouldNotSeeMe">'+'  <input type="hidden" id="composeType" name="composeType">'+'  <input type="hidden" id="fromAccount" name="fromAccount">'+'  <input type="hidden" id="sendSubject" name="sendSubject">'+'  <input type="hidden" id="sendDescription" name="sendDescription">'+'  <input type="hidden" id="sendTo" name="sendTo">'+'  <input type="hidden" id="sendBcc" name="sendBcc">'+'  <input type="hidden" id="sendCc" name="sendCc">'+'  <input type="hidden" id="setEditor" name="setEditor">'+'  <input type="hidden" id="saveToSugar" name="saveToSugar">'+'  <input type="hidden" id="parent_id" name="parent_id">'+'  <input type="hidden" id="parent_type" name="parent_type">'+'  <input type="hidden" id="attachments" name="attachments">'+'  <input type="hidden" id="documents" name="documents">'+'  <input type="hidden" id="outbound_email{idx}" name="outbound_email">'+'  <input type="hidden" id="templateAttachments" name="templateAttachments">'+'  <input type="hidden" id="templateAttachmentsRemove{idx}" name="templateAttachmentsRemove">'+'  <table id="composeHeaderTable{idx}" cellpadding="0" cellspacing="0" border="0" width="100%" class="list">'+'   <tr>'+'    <th><table cellpadding="0" cellspacing="0" border="0"><tbody><tr ><td style="padding: 0px !important;margin:0px; !important" >'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.sendEmail({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_send.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SEND}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.saveDraft({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_save.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SAVE_DRAFT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showAttachmentPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_attach.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_ATTACHMENT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showOptionsPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_options.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_OPTIONS}</button>'+'</td><td style="padding: 0px !important;margin:0px; !important">&nbsp;&nbsp;{mod_strings.LBL_EMAIL_RELATE}:&nbsp;&nbsp;<select class="select" id="data_parent_type{idx}" onchange="document.getElementById(\'data_parent_name{idx}\').value=\'\';document.getElementById(\'data_parent_id{idx}\').value=\'\'; SUGAR.email2.composeLayout.enableQuickSearchRelate(\'{idx}\');" name="data_parent_type{idx}">{linkbeans_options}</select>'+'&nbsp;</td><td style="padding: 0px !important;margin:0px; !important"><input id="data_parent_id{idx}" name="data_parent_id{idx}" type="hidden" value="">'+'<input class="sqsEnabled" id="data_parent_name{idx}" name="data_parent_name{idx}" type="text" value="">&nbsp;<button type="button" class="button" onclick="SUGAR.email2.composeLayout.callopenpopupForEmail2({idx});"><img src="index.php?entryPoint=getImage&themeName=default&imageName=id-ff-select.png" align="absmiddle" border="0"></button>'+'   </td></tr></tbody></table></th>'+'   </tr>'+'   <tr>'+'    <td>'+'     <div style="margin:5px;">'+'     <table cellpadding="4" cellspacing="0" border="0" width="100%">'+'      <tr>'+'       <td class="emailUILabel" NOWRAP >'+'        <label for="addressFrom{idx}">{app_strings.LBL_EMAIL_FROM}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div>'+'         &nbsp;&nbsp;<select style="width: 500px;" class="ac_input" id="addressFrom{idx}" name="addressFrom{idx}"></select>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP>'+'        <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressTO{idx}\')">'+'                                   {app_strings.LBL_EMAIL_TO}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressTO{idx}" title="{app_strings.LBL_EMAIL_TO}" name="addressTO{idx}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressTO{idx}" href="#" style="display: none;">+<span id="DetailaddressTO{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressToAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr id="add_addr_options_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>&nbsp;</td><td class="emailUIField" valign="top" NOWRAP>&nbsp;&nbsp;<span id="cc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'cc\',\'{idx}\');">{mod_strings.LBL_ADD_CC}</a></span><span id="bcc_cc_sep{idx}">&nbsp;{mod_strings.LBL_ADD_CC_BCC_SEP}&nbsp;</span><span id="bcc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'bcc\',\'{idx}\');">{mod_strings.LBL_ADD_BCC}</a></span></td>'+'      </tr>'+'      <tr class="yui-hidden" id="cc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressCC{idx}\')">'+'        {app_strings.LBL_EMAIL_CC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressCC{idx}" name="addressCC{idx}"   title="{app_strings.LBL_EMAIL_CC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressCC{idx}" href="#"  style="display: none;">+<span id="DetailaddressCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressCcAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr class="yui-hidden" id="bcc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressBCC{idx}\')">'+'                               {app_strings.LBL_EMAIL_BCC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressBCC{idx}" name="addressBCC{idx}" title="{app_strings.LBL_EMAIL_BCC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressBCC{idx}" href="#" style="display: none;">+<span id="DetailaddressBCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressBccAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP width="1%">'+'        <label for="emailSubject{idx}">{app_strings.LBL_EMAIL_SUBJECT}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP width="99%">'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="">'+'        </div>'+'       </td>'+'      </tr>'+'     </table>'+'     </div>'+'    </td>'+'   </tr>'+'  </table>'+'  <textarea id="htmleditor{idx}" name="htmleditor{idx}" style="width:100%; height: 100px;"></textarea>'+'  <div id="divAttachments{idx}" class="ylayout-inactive-content">'+'   <div style="padding:5px;">'+'    <table cellpadding="2" cellspacing="0" border="0">'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_file_button" onclick="SUGAR.email2.composeLayout.addFileField();" value="{mod_strings.LBL_ADD_FILE}" class="button" />'+'       <div id="addedFiles{idx}" name="addedFiles{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS2}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_document_button" onclick="SUGAR.email2.composeLayout.addDocumentField({idx});" value="{mod_strings.LBL_ADD_DOCUMENT}" class="button" />'+'       <div id="addedDocuments{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <div id="templateAttachmentsTitle{idx}" style="display:none"><b>{app_strings.LBL_EMAIL_ATTACHMENTS3}</b></div>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <div id="addedTemplateAttachments{idx}"></div>'+'      </td>'+'     </tr>'+'    </table>'+'   </div>'+'  </div>'+' </form>'+'  <div id="divOptions{idx}" class="ylayout-inactive-content"'+'             <div style="padding:5px;">'+'   <form name="composeOptionsForm{idx}" id="composeOptionsForm{idx}">'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_TEMPLATES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="email_template{idx}" id="email_template{idx}"  onchange="SUGAR.email2.composeLayout.applyEmailTemplate(\'{idx}\', this.options[this.selectedIndex].value);"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <br />'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_SIGNATURES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="signatures{idx}" id="signatures{idx}" onchange="SUGAR.email2.composeLayout.setSignature(\'{idx}\');"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <input type="checkbox" id="setEditor{idx}" name="setEditor{idx}" value="1" onclick="SUGAR.email2.composeLayout.renderTinyMCEToolBar(\'{idx}\', this.checked);"/>&nbsp;'+'       <b>{mod_strings.LBL_SEND_IN_PLAIN_TEXT}</b>'+'      </td>'+'     </tr>'+'    </table>'+'         </form>'+'   </div> '+'  </div>'+'</div>';/* End of File modules/Emails/javascript/composeEmailTemplate.js */
+SUGAR.email2.templates['compose']='<div id="composeLayout{idx}" class="ylayout-inactive-content"></div>'+'<div id="composeOverFrame{idx}" style="height:100%;width:100%">'+' <form id="emailCompose{idx}" name="ComposeEditView{idx}" action="index.php" method="POST">'+'  <input type="hidden" id="email_id{idx}" name="email_id" value="">'+'  <input type="hidden" id="uid{idx}" name="uid" value="">'+'  <input type="hidden" id="ieId{idx}" name="ieId" value="">'+'  <input type="hidden" id="mbox{idx}" name="mbox" value="">'+'  <input type="hidden" id="type{idx}" name="type" value="">'+'  <input type="hidden" id="composeLayoutId" name="composeLayoutId" value="shouldNotSeeMe">'+'  <input type="hidden" id="composeType" name="composeType">'+'  <input type="hidden" id="fromAccount" name="fromAccount">'+'  <input type="hidden" id="sendSubject" name="sendSubject">'+'  <input type="hidden" id="sendDescription" name="sendDescription">'+'  <input type="hidden" id="sendTo" name="sendTo">'+'  <input type="hidden" id="sendBcc" name="sendBcc">'+'  <input type="hidden" id="sendCc" name="sendCc">'+'  <input type="hidden" id="setEditor" name="setEditor">'+'  <input type="hidden" id="saveToSugar" name="saveToSugar">'+'  <input type="hidden" id="parent_id" name="parent_id">'+'  <input type="hidden" id="parent_type" name="parent_type">'+'  <input type="hidden" id="attachments" name="attachments">'+'  <input type="hidden" id="documents" name="documents">'+'  <input type="hidden" id="outbound_email{idx}" name="outbound_email">'+'  <input type="hidden" id="templateAttachments" name="templateAttachments">'+'  <input type="hidden" id="templateAttachmentsRemove{idx}" name="templateAttachmentsRemove">'+'  <table id="composeHeaderTable{idx}" cellpadding="0" cellspacing="0" border="0" width="100%" class="list">'+'   <tr>'+'    <th><table cellpadding="0" cellspacing="0" border="0"><tbody><tr ><td style="padding: 0px !important;margin:0px; !important" >'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.sendEmail({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_send.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SEND}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.saveDraft({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_save.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_SAVE_DRAFT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showAttachmentPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_attach.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_ATTACHMENT}</button>'+'     <button type="button" class="button" onclick="SUGAR.email2.composeLayout.showOptionsPanel({idx}, false);"><img src="index.php?entryPoint=getImage&themeName='+SUGAR.themes.theme_name+'&imageName=icon_email_options.gif" align="absmiddle" border="0"> {app_strings.LBL_EMAIL_OPTIONS}</button>'+'</td><td style="padding: 0px !important;margin:0px; !important">&nbsp;&nbsp;{mod_strings.LBL_EMAIL_RELATE}:&nbsp;&nbsp;<select class="select" id="data_parent_type{idx}" onchange="document.getElementById(\'data_parent_name{idx}\').value=\'\';document.getElementById(\'data_parent_id{idx}\').value=\'\'; SUGAR.email2.composeLayout.enableQuickSearchRelate(\'{idx}\');" name="data_parent_type{idx}">{linkbeans_options}</select>'+'&nbsp;</td><td style="padding: 0px !important;margin:0px; !important"><input id="data_parent_id{idx}" name="data_parent_id{idx}" type="hidden" value="">'+'<input class="sqsEnabled" id="data_parent_name{idx}" name="data_parent_name{idx}" type="text" value="">&nbsp;<button type="button" class="button" onclick="SUGAR.email2.composeLayout.callopenpopupForEmail2({idx});"><img src="index.php?entryPoint=getImage&themeName=default&imageName=id-ff-select.png" align="absmiddle" border="0"></button>'+'   </td></tr></tbody></table></th>'+'   </tr>'+'   <tr>'+'    <td>'+'     <div style="margin:5px;">'+'     <table cellpadding="4" cellspacing="0" border="0" width="100%">'+'      <tr>'+'       <td class="emailUILabel" NOWRAP >'+'        <label for="addressFrom{idx}">{app_strings.LBL_EMAIL_FROM}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div>'+'         &nbsp;&nbsp;<select style="width: 500px;" class="ac_input" id="addressFrom{idx}" name="addressFrom{idx}"></select>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP>'+'        <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressTO{idx}\')">'+'                                   {app_strings.LBL_EMAIL_TO}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressTO{idx}" title="{app_strings.LBL_EMAIL_TO}" name="addressTO{idx}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressTO{idx}" href="#" style="display: none;">+<span id="DetailaddressTO{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressToAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr id="add_addr_options_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>&nbsp;</td><td class="emailUIField" valign="top" NOWRAP>&nbsp;&nbsp;<span id="cc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'cc\',\'{idx}\');">{mod_strings.LBL_ADD_CC}</a></span><span id="bcc_cc_sep{idx}">&nbsp;{mod_strings.LBL_ADD_CC_BCC_SEP}&nbsp;</span><span id="bcc_span{idx}"><a href="#" onclick="SE.composeLayout.showHiddenAddress(\'bcc\',\'{idx}\');">{mod_strings.LBL_ADD_BCC}</a></span></td>'+'      </tr>'+'      <tr class="yui-hidden" id="cc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressCC{idx}\')">'+'        {app_strings.LBL_EMAIL_CC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressCC{idx}" name="addressCC{idx}"   title="{app_strings.LBL_EMAIL_CC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressCC{idx}" href="#"  style="display: none;">+<span id="DetailaddressCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressCcAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr class="yui-hidden" id="bcc_tr{idx}">'+'       <td class="emailUILabel" NOWRAP>'+'                               <button class="button" type="button" onclick="SUGAR.email2.addressBook.selectContactsDialogue(\'addressBCC{idx}\')">'+'                               {app_strings.LBL_EMAIL_BCC}:'+'                               </button>'+'       </td>'+'       <td class="emailUIField" NOWRAP>'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="addressBCC{idx}" name="addressBCC{idx}" title="{app_strings.LBL_EMAIL_BCC}" onkeyup="SE.composeLayout.showAddressDetails(this);">'+'         <span class="rolloverEmail"> <a id="MoreaddressBCC{idx}" href="#" style="display: none;">+<span id="DetailaddressBCC{idx}">&nbsp;</span></a> </span>'+'         <div class="ac_container" id="addressBccAC{idx}"></div>'+'        </div>'+'       </td>'+'      </tr>'+'      <tr>'+'       <td class="emailUILabel" NOWRAP width="1%">'+'        <label for="emailSubject{idx}">{app_strings.LBL_EMAIL_SUBJECT}:</label>'+'       </td>'+'       <td class="emailUIField" NOWRAP width="99%">'+'        <div class="ac_autocomplete">'+'         &nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="" maxlength="'+SUGAR.email2.composeLayout.subjectMaxlen+'">'+'        </div>'+'       </td>'+'      </tr>'+'     </table>'+'     </div>'+'    </td>'+'   </tr>'+'  </table>'+'  <textarea id="htmleditor{idx}" name="htmleditor{idx}" style="width:100%; height: 100px;"></textarea>'+'  <div id="divAttachments{idx}" class="ylayout-inactive-content">'+'   <div style="padding:5px;">'+'    <table cellpadding="2" cellspacing="0" border="0">'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_file_button" onclick="SUGAR.email2.composeLayout.addFileField();" value="{mod_strings.LBL_ADD_FILE}" class="button" />'+'       <div id="addedFiles{idx}" name="addedFiles{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <b>{app_strings.LBL_EMAIL_ATTACHMENTS2}</b>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <input type="button" name="add_document_button" onclick="SUGAR.email2.composeLayout.addDocumentField({idx});" value="{mod_strings.LBL_ADD_DOCUMENT}" class="button" />'+'       <div id="addedDocuments{idx}"></div>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td>'+'       &nbsp;'+'       <br />'+'       &nbsp;'+'      </td>'+'     </tr>'+'     <tr>'+'      <th>'+'       <div id="templateAttachmentsTitle{idx}" style="display:none"><b>{app_strings.LBL_EMAIL_ATTACHMENTS3}</b></div>'+'       <br />'+'       &nbsp;'+'      </th>'+'     </tr>'+'     <tr>'+'      <td>'+'       <div id="addedTemplateAttachments{idx}"></div>'+'      </td>'+'     </tr>'+'    </table>'+'   </div>'+'  </div>'+' </form>'+'  <div id="divOptions{idx}" class="ylayout-inactive-content"'+'             <div style="padding:5px;">'+'   <form name="composeOptionsForm{idx}" id="composeOptionsForm{idx}">'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_TEMPLATES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="email_template{idx}" id="email_template{idx}"  onchange="SUGAR.email2.composeLayout.applyEmailTemplate(\'{idx}\', this.options[this.selectedIndex].value);"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <br />'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <b>{app_strings.LBL_EMAIL_SIGNATURES}:</b>'+'      </td>'+'     </tr>'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <select name="signatures{idx}" id="signatures{idx}" onchange="SUGAR.email2.composeLayout.setSignature(\'{idx}\');"></select>'+'      </td>'+'     </tr>'+'    </table>'+'    <table border="0" width="100%">'+'     <tr>'+'      <td NOWRAP style="padding:2px;">'+'       <input type="checkbox" id="setEditor{idx}" name="setEditor{idx}" value="1" onclick="SUGAR.email2.composeLayout.renderTinyMCEToolBar(\'{idx}\', this.checked);"/>&nbsp;'+'       <b>{mod_strings.LBL_SEND_IN_PLAIN_TEXT}</b>'+'      </td>'+'     </tr>'+'    </table>'+'         </form>'+'   </div> '+'  </div>'+'</div>';/* End of File modules/Emails/javascript/composeEmailTemplate.js */
 
 
 function complexLayoutInit(){var se=SUGAR.email2;var Dom=YAHOO.util.Dom;se.e2Layout={getInnerLayout:function(rows){se.listViewLayout=new YAHOO.widget.Layout('listViewDiv',{parent:se.complexLayout,border:true,hideOnLayout:true,height:400,units:[{position:"center",scroll:false,split:true,body:"<div id='emailGrid'></div><div id='dt-pag-nav'></div> "},{position:"bottom",scroll:true,collapse:false,resize:true,useShim:true,height:'250',body:"<div id='listBottom' />"},{position:"right",scroll:true,collapse:false,resize:true,useShim:true,width:'250',body:"<div id='listRight' />",titlebar:false}]});se.complexLayout.on("render",function(){var height=SUGAR.email2.innerLayout.get("element").clientHeight-30;SUGAR.email2.innerLayout.get("activeTab").get("contentEl").parentNode.style.height=height+"px";SUGAR.email2.listViewLayout.set("height",height);SUGAR.email2.listViewLayout.render();});se.listViewLayout.render();se.listViewLayout.get("element").parentNode.parentNode.style.padding="0px"
 var rp=se.listViewLayout.resizePreview=function(){var pre=Dom.get("displayEmailFramePreview");if(pre){var parent=Dom.getAncestorByClassName(pre,"yui-layout-bd");pre.style.height=(parent.clientHeight-pre.offsetTop)+"px";}};se.listViewLayout.getUnitByPosition("bottom").on("heightChange",se.autoSetLayout);se.listViewLayout.getUnitByPosition("right").on("endResize",se.autoSetLayout);se.e2Layout.setPreviewPanel(rows);se.previewLayout=se.listViewLayout;return se.listViewLayout;},getInnerLayout2Rows:function(){return this.getInnerLayout(true);},getInnerLayout2Columns:function(){return this.getInnerLayout(false);},init:function(){var viewHeight=document.documentElement?document.documentElement.clientHeight:self.innerHeight;var heightOffset=$('#dcmenu').length>0?$('#dcmenu').height():$('#header').height();se.complexLayout=new YAHOO.widget.Layout("container",{border:true,hideOnLayout:true,height:Dom.getViewportHeight()-heightOffset-65,width:Dom.getViewportWidth()-40,units:[{position:"center",scroll:false,body:"<div id='emailtabs'></div>"},{position:"left",scroll:true,body:"<div id='lefttabs'></div>",collapse:true,width:210,minWidth:100,resize:true,useShim:true,titlebar:true,header:"&nbsp;"},{header:Dom.get('footerLinks').innerHTML,position:'bottom',id:'mbfooter',height:22,border:false}]});se.complexLayout.render();var tp=se.innerLayout=new YAHOO.widget.TabView("emailtabs");tp.addTab(new YAHOO.widget.Tab({label:"Inbox",scroll:true,content:"<div id='listViewDiv'/>",id:"center",active:true}));var centerEl=se.complexLayout.getUnitByPosition('center').get('wrap');tp.appendTo(centerEl);tp.get("element").style.borderRight="1px solid #666"
-var listV=this.getInnerLayout2Rows();listV.set("height",tp.get("element").clientHeight-25);listV.render();se.leftTabs=new YAHOO.widget.TabView("lefttabs");var folderTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_FOLDERS_SHORT,scroll:true,content:"<div id='emailtree'/>",id:"tree",active:true});folderTab.on("activeChange",function(o){if(o.newValue){se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_FOLDERS);}});se.leftTabs.addTab(folderTab);var tabContent=SUGAR.util.getAndRemove("searchTab");var searchTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_SEARCH_SHORT,scroll:true,content:tabContent.innerHTML,id:tabContent.id});searchTab.on("activeChange",function(o){if(o.newValue)
+var listV=this.getInnerLayout2Rows();listV.set("height",tp.get("element").clientHeight-25);listV.render();tp.on("activeTabChange",function()
+{se.complexLayout.resize();});se.leftTabs=new YAHOO.widget.TabView("lefttabs");var folderTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_FOLDERS_SHORT,scroll:true,content:"<div id='emailtree'/>",id:"tree",active:true});folderTab.on("activeChange",function(o){if(o.newValue){se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_FOLDERS);}});se.leftTabs.addTab(folderTab);var tabContent=SUGAR.util.getAndRemove("searchTab");var searchTab=new YAHOO.widget.Tab({label:app_strings.LBL_EMAIL_SEARCH_SHORT,scroll:true,content:tabContent.innerHTML,id:tabContent.id});searchTab.on("activeChange",function(o){if(o.newValue)
 {se.complexLayout.getUnitByPosition("left").set("header",app_strings.LBL_EMAIL_SEARCH);Calendar.setup({inputField:"searchDateFrom",ifFormat:calFormat,showsTime:false,button:"searchDateFrom_trigger",singleClick:true,step:1,weekNumbers:false});Calendar.setup({inputField:"searchDateTo",ifFormat:calFormat,showsTime:false,button:"searchDateTo_trigger",singleClick:true,step:1,weekNumbers:false});se.e2Layout.initSQSObject('advancedSearchForm','assigned_user_name');var parentSearchArgs={'formName':'advancedSearchForm','fieldName':'data_parent_name_search','moduleSelectField':'data_parent_type_search','fieldId':'data_parent_id_search'};YAHOO.util.Event.addListener('data_parent_type_search','change',function(){SUGAR.email2.composeLayout.enableQuickSearchRelate(null,parentSearchArgs)});var addKeyPressFields=['searchSubject','searchFrom','searchTo','data_parent_name_search','searchDateTo','searchDateFrom','attachmentsSearch','assigned_user_name'];for(var i=0;i<addKeyPressFields.length;i++)
 {YAHOO.util.Event.addListener(window.document.forms['advancedSearchForm'].elements[addKeyPressFields[i]],"keydown",function(e){if(e.keyCode==13){YAHOO.util.Event.stopEvent(e);SUGAR.email2.search.searchAdvanced();}});}
 enableQS(true);YAHOO.util.Event.addListener('data_parent_type_search','change',function(){document.getElementById('data_parent_id_search').value='';document.getElementById('data_parent_name_search').value='';});}});se.leftTabs.addTab(searchTab);var resizeTabBody=function(){var height=SUGAR.email2.leftTabs.get("element").clientHeight-30;SUGAR.email2.leftTabs.get("activeTab").get("contentEl").parentNode.style.height=height+"px";}
diff --git a/data/BeanFactory.php b/data/BeanFactory.php
index fe2c1387..2fb34a7a 100644
--- a/data/BeanFactory.php
+++ b/data/BeanFactory.php
@@ -54,14 +54,26 @@ class BeanFactory {
      * Returns a SugarBean object by id. The Last 10 loaded beans are cached in memory to prevent multiple retrieves per request.
      * If no id is passed, a new bean is created.
      * @static
-     * @param  String $module
+     * @param String $module
      * @param String $id
-     * @param Bool $encode @see SugarBean::retrieve
+     * @param Array $params A name/value array of parameters. Names: encode, deleted, 
+     *        If $params is boolean we revert to the old arguments (encode, deleted), and use $params as $encode.
+     *        This will be changed to using only $params in later versions.
      * @param Bool $deleted @see SugarBean::retrieve
      * @return SugarBean
      */
-    public static function getBean($module, $id = null, $encode = true, $deleted = true)
+    public static function getBean($module, $id = null, $params = array(), $deleted = true)
     {
+    	
+    	// Check if params is an array, if not use old arguments
+    	if (isset($params) && !is_array($params)) {
+    		$params = array('encode' => $params);
+    	}
+    	
+    	// Pull values from $params array
+    	$encode = isset($params['encode']) ? $params['encode'] : true;
+    	$deleted = isset($params['deleted']) ? $params['deleted'] : $deleted;
+    	
         if (!isset(self::$loadedBeans[$module])) {
             self::$loadedBeans[$module] = array();
             self::$touched[$module] = array();
diff --git a/data/Link2.php b/data/Link2.php
index c7e337a5..f0a331ac 100644
--- a/data/Link2.php
+++ b/data/Link2.php
@@ -531,7 +531,8 @@ class Link2 {
      */
     protected function getRelatedBean($id = false)
     {
-        return BeanFactory::getBean($this->getRelatedModuleName(), $id);
+        $params = array('encode' => true, 'deleted' => true);
+        return BeanFactory::getBean($this->getRelatedModuleName(), $id, $params);
     }
 
     public function &__get($name)
diff --git a/data/Relationships/EmailAddressRelationship.php b/data/Relationships/EmailAddressRelationship.php
index 4fba979d..dff9ef95 100644
--- a/data/Relationships/EmailAddressRelationship.php
+++ b/data/Relationships/EmailAddressRelationship.php
@@ -62,6 +62,11 @@ class EmailAddressRelationship extends M2MRelationship
             return false;
         }
 
+            if ($lhs->$lhsLinkName->beansAreLoaded())
+                $lhs->$lhsLinkName->addBean($rhs);
+
+            $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
+
         //Many to many has no additional logic, so just add a new row to the table and notify the beans.
         $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
 
@@ -93,6 +98,16 @@ class EmailAddressRelationship extends M2MRelationship
             $GLOBALS['log']->fatal("could not load LHS $lhsLinkName");
             return false;
         }
+
+        if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+        {
+            if (!empty($lhs->$lhsLinkName))
+            {
+                $lhs->$lhsLinkName->load();
+                $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
+            }
+        }
+
         $dataToRemove = array(
             $this->def['join_key_lhs'] => $lhs->id,
             $this->def['join_key_rhs'] => $rhs->id
diff --git a/data/Relationships/M2MRelationship.php b/data/Relationships/M2MRelationship.php
index 39c18ddc..f0a4e6bf 100644
--- a/data/Relationships/M2MRelationship.php
+++ b/data/Relationships/M2MRelationship.php
@@ -141,6 +141,12 @@ class M2MRelationship extends SugarRelationship
             return false;
         }
 
+            $lhs->$lhsLinkName->addBean($rhs);
+            $rhs->$rhsLinkName->addBean($lhs);
+
+            $this->callBeforeAdd($lhs, $rhs, $lhsLinkName);
+            $this->callBeforeAdd($rhs, $lhs, $rhsLinkName);
+
         //Many to many has no additional logic, so just add a new row to the table and notify the beans.
         $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields);
 
@@ -234,6 +240,21 @@ class M2MRelationship extends SugarRelationship
             return false;
         }
 
+        if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+        {
+            if ($lhs->$lhsLinkName instanceof Link2)
+            {
+                $lhs->$lhsLinkName->load();
+                $this->callBeforeDelete($lhs, $rhs, $lhsLinkName);
+            }
+
+            if ($rhs->$rhsLinkName instanceof Link2)
+            {
+                $rhs->$rhsLinkName->load();
+                $this->callBeforeDelete($rhs, $lhs, $rhsLinkName);
+            }
+        }
+
         $dataToRemove = array(
             $this->def['join_key_lhs'] => $lhs->id,
             $this->def['join_key_rhs'] => $rhs->id
diff --git a/data/Relationships/One2MBeanRelationship.php b/data/Relationships/One2MBeanRelationship.php
index a3d06fef..d144e5e8 100644
--- a/data/Relationships/One2MBeanRelationship.php
+++ b/data/Relationships/One2MBeanRelationship.php
@@ -63,7 +63,7 @@ class One2MBeanRelationship extends One2MRelationship
         // test to see if the relationship exist if the relationship between the two beans
         // exist then we just fail out with false as we don't want to re-trigger this
         // the save and such as it causes problems with the related() in sugarlogic
-        if($this->relationship_exists($lhs, $rhs)) return false;
+        if($this->relationship_exists($lhs, $rhs) && !empty($GLOBALS['resavingRelatedBeans'])) return false;
 
         $lhsLinkName = $this->lhsLink;
         $rhsLinkName = $this->rhsLink;
@@ -85,8 +85,13 @@ class One2MBeanRelationship extends One2MRelationship
             $lhs->$lhsLinkName->load();
         }
 
-        $this->updateFields($lhs, $rhs, $additionalFields);
+        if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+        {
+            $this->callBeforeAdd($lhs, $rhs);
+            $this->callBeforeAdd($rhs, $lhs);
+        }
 
+        $this->updateFields($lhs, $rhs, $additionalFields);
 
         if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
         {
@@ -99,6 +104,11 @@ class One2MBeanRelationship extends One2MRelationship
             $this->callAfterAdd($lhs, $rhs);
             $this->callAfterAdd($rhs, $lhs);
         }
+
+        //One2MBean relationships require that the RHS bean be saved or else the relationship will not be saved.
+        //If we aren't already in a relationship save, intitiate a save now.
+        if (empty($GLOBALS['resavingRelatedBeans']))
+            SugarRelationship::resaveRelatedBeans();
     }
 
     protected function updateLinks($lhs, $lhsLinkName, $rhs, $rhsLinkName)
@@ -137,6 +147,12 @@ class One2MBeanRelationship extends One2MRelationship
 
         $rhs->$rhsID = '';
 
+        if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes")
+        {
+            $this->callBeforeDelete($lhs, $rhs);
+            $this->callBeforeDelete($rhs, $lhs);
+        }
+
         if ($save && !$rhs->deleted)
         {
             $rhs->in_relationship_update = TRUE;
@@ -298,13 +314,27 @@ class One2MBeanRelationship extends One2MRelationship
         $alias = empty($params['join_table_alias']) ? "{$link->name}_rel": $params['join_table_alias'];
         $alias = $GLOBALS['db']->getValidDBName($alias, false, 'alias');
 
+        $tableInRoleFilter = "";
+        if ($targetTable == "meetings" && $linkIsLHS == false) { 
+            if ($alias == "meetings_activities_1_meetings_rel" ||
+                $alias == "meetings_activities_1_tasks_rel" ||
+                $alias == "meetings_activities_1_calls_rel" ||
+                $alias == "meetings_activities_1_emails_rel" ||
+                $alias == "meetings_activities_1_notes_rel")
+                $tableInRoleFilter = $alias;
+        }
+        
         //Set up any table aliases required
         $targetTableWithAlias = "$targetTable $alias";
         $targetTable = $alias;
 
         $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n"
         //Next add any role filters
-               . $this->getRoleWhere() . "\n";
+               . $this->getRoleWhere($tableInRoleFilter) . "\n";
+
+        if (!empty($params['return_as_array'])) {
+            $return_array = true;
+        }
 
         if($return_array){
             return array(
diff --git a/data/Relationships/One2MRelationship.php b/data/Relationships/One2MRelationship.php
index 8e2942a0..2d99a06c 100644
--- a/data/Relationships/One2MRelationship.php
+++ b/data/Relationships/One2MRelationship.php
@@ -124,16 +124,41 @@ class One2MRelationship extends M2MRelationship
         //If the current data matches the existing data, don't do anything
         if (!$this->checkExisting($dataToInsert))
         {
-            $rhsLinkName = $this->rhsLink;
-            //In a one to many, any existing links from the many (right) side must be removed first
-            $rhs->load_relationship($rhsLinkName);
-            $this->removeAll($rhs->$rhsLinkName);
+			// If it's a One2Many self-referencing relationship
+        	// the positions of the default One (LHS) and Many (RHS) are swaped
+        	// so we should clear the links from the many (left) side
+        	if ($this->selfReferencing) {
+        		// Load right hand side relationship name
+	            $linkName = $this->rhsLink;
+	            // Load the relationship into the left hand side bean
+	            $lhs->load_relationship($linkName);
+	            
+	            // Pick the loaded link
+	            $link = $lhs->$linkName;
+	            // Get many (LHS) side bean
+	            $focus = $link->getFocus();
+	            // Get relations
+	        	$related = $link->getBeans();
+	        	
+        		// Clear the relations from many side bean
+	        	foreach($related as $relBean) {
+	        		$this->remove($focus, $relBean);
+	        	}
+            } else { // For non self-referencing, just load the many (RHS) side, and remove all the relationships from it
+            	$rhsLinkName = $this->rhsLink;
+	            //In a one to many, any existing links from the many (right) side must be removed first
+            	$rhs->load_relationship($rhsLinkName);
+            	$this->removeAll($rhs->$rhsLinkName);
+            }
+            // Add relationship
             parent::add($lhs, $rhs, $additionalFields);
         }
     }
 
     /**
      * Just overriding the function from M2M to prevent it from occuring
+     * 
+     * The logic for dealing with adding self-referencing one-to-many relations is in the add() method
      */
     protected function addSelfReferencing($lhs, $rhs, $additionalFields = array())
     {
diff --git a/data/Relationships/SugarRelationship.php b/data/Relationships/SugarRelationship.php
index 338170be..ac6b2df5 100644
--- a/data/Relationships/SugarRelationship.php
+++ b/data/Relationships/SugarRelationship.php
@@ -333,6 +333,19 @@ abstract class SugarRelationship
         return $custom_logic_arguments;
     }
 
+    /**
+     * Call the before add logic hook for a given link
+     * @param  SugarBean $focus base bean the hooks is triggered from
+     * @param  SugarBean $related bean being added/removed/updated from relationship
+     * @param string $link_name name of link being triggerd
+     * @return void
+     */
+    protected function callBeforeAdd($focus, $related, $link_name="")
+    {
+        $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
+        $focus->call_custom_logic('before_relationship_add', $custom_logic_arguments);
+    }
+
     /**
      * Call the after add logic hook for a given link
      * @param  SugarBean $focus base bean the hooks is triggered from
@@ -346,6 +359,18 @@ abstract class SugarRelationship
         $focus->call_custom_logic('after_relationship_add', $custom_logic_arguments);
     }
 
+    /**
+     * @param  SugarBean $focus
+     * @param  SugarBean $related
+     * @param string $link_name
+     * @return void
+     */
+    protected function callBeforeDelete($focus, $related, $link_name="")
+    {
+        $custom_logic_arguments = $this->getCustomLogicArguments($focus, $related, $link_name);
+        $focus->call_custom_logic('before_relationship_delete', $custom_logic_arguments);
+    }
+
     /**
      * @param  SugarBean $focus
      * @param  SugarBean $related
diff --git a/data/SugarBean.php b/data/SugarBean.php
index b436c016..bddde7b4 100644
--- a/data/SugarBean.php
+++ b/data/SugarBean.php
@@ -84,6 +84,12 @@ class SugarBean
 	var $new_with_id = false;
 
 
+	/**
+	 * How deep logic hooks can go
+	 * @var int
+	 */
+	protected $max_logic_depth = 10;
+
 	/**
 	 * Disble vardefs.  This should be set to true only for beans that do not have varders.  Tracker is an example
 	 *
@@ -258,6 +264,13 @@ class SugarBean
      * Set to true in <modules>/Import/views/view.step4.php if a module is being imported
      */
     var $in_import = false;
+    /**
+     * A way to keep track of the loaded relationships so when we clone the object we can unset them.
+     *
+     * @var array
+     */
+    protected $loaded_relationships = array();
+
     /**
      * Constructor for the bean, it performs following tasks:
      *
@@ -466,11 +479,21 @@ class SugarBean
 
         require('metadata/audit_templateMetaData.php');
 
+        // Bug: 52583 Need ability to customize template for audit tables
+        $custom = 'custom/metadata/audit_templateMetaData_' . $this->getTableName() . '.php';
+        if (file_exists($custom))
+        {
+            require($custom);
+        }
+
         $fieldDefs = $dictionary['audit']['fields'];
         $indices = $dictionary['audit']['indices'];
-        // '0' stands for the first index for all the audit tables
-        $indices[0]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $indices[0]['name'];
-        $indices[1]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $indices[1]['name'];
+
+        // Renaming template indexes to fit the particular audit table (removed the brittle hard coding)
+        foreach($indices as $nr => $properties){
+            $indices[$nr]['name'] = 'idx_' . strtolower($this->getTableName()) . '_' . $properties['name'];
+        }
+
         $engine = null;
         if(isset($dictionary['audit']['engine'])) {
             $engine = $dictionary['audit']['engine'];
@@ -478,10 +501,7 @@ class SugarBean
             $engine = $dictionary[$this->getObjectName()]['engine'];
         }
 
-        $sql=$this->db->createTableSQLParams($table_name, $fieldDefs, $indices, $engine);
-
-        $msg = "Error creating table: ".$table_name. ":";
-        $this->db->query($sql,true,$msg);
+        $this->db->createTableParams($table_name, $fieldDefs, $indices, $engine);
     }
 
     /**
@@ -888,6 +908,23 @@ class SugarBean
     }
 
 
+    /**
+     * Handle the following when a SugarBean object is cloned
+     *
+     * Currently all this does it unset any relationships that were created prior to cloning the object
+     *
+     * @api
+     */
+    public function __clone()
+    {
+        if(!empty($this->loaded_relationships)) {
+            foreach($this->loaded_relationships as $rel) {
+                unset($this->$rel);
+            }
+        }
+    }
+
+
     /**
      * Loads the request relationship. This method should be called before performing any operations on the related data.
      *
@@ -931,6 +968,8 @@ class SugarBean
                     unset($this->$rel_name);
                     return false;
                 }
+                // keep track of the loaded relationships
+                $this->loaded_relationships[] = $rel_name;
                 return true;
             }
         }
@@ -1636,12 +1675,24 @@ function save_relationship_changes($is_update, $exclude=array())
         {
             $new_rel_id = $rel_id;
             $new_rel_link = $rel_link;
-            //Try to find the link in this bean based on the relationship
-            foreach ($this->field_defs as $key => $def)
+            // Bug #53223 : wrong relationship from subpanel create button
+            // if LHSModule and RHSModule are same module use left link to add new item b/s of:
+            // $rel_id and $rel_link are not emty - request is from subpanel
+            // $rel_link contains relationship name - checked by call load_relationship
+            $this->load_relationship($rel_link);
+            if ( !empty($this->$rel_link) && $this->$rel_link->getRelationshipObject() && $this->$rel_link->getRelationshipObject()->getLHSModule() == $this->$rel_link->getRelationshipObject()->getRHSModule() )
             {
-                if (isset($def['type']) && $def['type'] == 'link' && isset($def['relationship']) && $def['relationship'] == $rel_link)
+                $new_rel_link = $this->$rel_link->getRelationshipObject()->getLHSLink();
+            }
+            else
+            {
+                //Try to find the link in this bean based on the relationship
+                foreach ($this->field_defs as $key => $def)
                 {
-                    $new_rel_link = $key;
+                    if (isset($def['type']) && $def['type'] == 'link' && isset($def['relationship']) && $def['relationship'] == $rel_link)
+                    {
+                        $new_rel_link = $key;
+                    }
                 }
             }
          }
@@ -2841,6 +2892,8 @@ function save_relationship_changes($is_update, $exclude=array())
         if($custom_join)
         {
             $ret_array['from'] .= ' ' . $custom_join['join'];
+            // Bug 52490 - Captivea (Sve) - To be able to add custom fields inside where clause in a subpanel
+            $ret_array['from_min'] .= ' ' . $custom_join['join'];
         }
         $jtcount = 0;
         //LOOP AROUND FOR FIXIN VARDEF ISSUES
@@ -2942,12 +2995,16 @@ function save_relationship_changes($is_update, $exclude=array())
                 $ret_array['select'] .= ", $this->table_name.$field $alias";
                 $selectedFields["$this->table_name.$field"] = true;
             } else if(  (!isset($data['source']) || $data['source'] == 'custom_fields') && (!empty($alias) || !empty($filter) )) {
-                $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
+                //add this column only if it has NOT already been added to select statement string
+                $colPos = strpos($ret_array['select'],"$this->table_name"."_cstm".".$field");
+                if(!$colPos || $colPos<0)
+                {
+                    $ret_array['select'] .= ", $this->table_name"."_cstm".".$field $alias";
+                }
+
                 $selectedFields["$this->table_name.$field"] = true;
             }
 
-
-
             if($data['type'] != 'relate' && isset($data['db_concat_fields']))
             {
                 $ret_array['select'] .= ", " . $this->db->concat($this->table_name, $data['db_concat_fields']) . " as $field";
@@ -4508,7 +4565,7 @@ function save_relationship_changes($is_update, $exclude=array())
         if(!empty($where_clause)) {
             return "WHERE $where_clause AND deleted=0";
         } else {
-            return "WHERE deteled=0";
+            return "WHERE deleted=0";
         }
     }
 
@@ -4809,7 +4866,7 @@ function save_relationship_changes($is_update, $exclude=array())
         if(!isset($this->processed) || $this->processed == false){
             //add some logic to ensure we do not get into an infinite loop
             if(!empty($this->logicHookDepth[$event])) {
-                if($this->logicHookDepth[$event] > 10)
+                if($this->logicHookDepth[$event] > $this->max_logic_depth)
                     return;
             }else
                 $this->logicHookDepth[$event] = 0;
@@ -4827,6 +4884,7 @@ function save_relationship_changes($is_update, $exclude=array())
             $logicHook = new LogicHook();
             $logicHook->setBean($this);
             $logicHook->call_custom_logic($this->module_dir, $event, $arguments);
+            $this->logicHookDepth[$event]--;
         }
     }
 
diff --git a/download.php b/download.php
index 45ca2e28..13d28f62 100644
--- a/download.php
+++ b/download.php
@@ -52,6 +52,7 @@ else {
     $app_strings = return_application_language($GLOBALS['current_language']);
     $mod_strings = return_module_language($GLOBALS['current_language'], 'ACL');
 	$file_type = strtolower($_REQUEST['type']);
+    $check_image = false;
     if(!isset($_REQUEST['isTempFile'])) {
 	    //Custom modules may have capitalizations anywhere in their names. We should check the passed in format first.
 		require('include/modules.php');
@@ -93,12 +94,12 @@ else {
         // See if it is a remote file, if so, send them that direction
         if ( isset($focus->doc_url) && !empty($focus->doc_url) ) {
             header('Location: '.$focus->doc_url);
-            sugar_die();
+            sugar_die("Remote file detected, location header sent.");
         }
 
         if ( isset($focusRevision) && isset($focusRevision->doc_url) && !empty($focusRevision->doc_url) ) {
             header('Location: '.$focusRevision->doc_url);
-            sugar_die();
+            sugar_die("Remote file detected, location header sent.");
         }
 
     } // if
@@ -134,6 +135,7 @@ else {
 		}  elseif($file_type == 'notes') {
 			$query = "SELECT filename name FROM notes ";
 			$query .= "WHERE notes.id = '" . $db->quote($_REQUEST['id']) ."'";
+            $check_image = true;
 		} elseif( !isset($_REQUEST['isTempFile']) && !isset($_REQUEST['tempName'] ) && isset($_REQUEST['type']) && $file_type!='temp' ){ //make sure not email temp file.
 			$query = "SELECT filename name FROM ". $file_type ." ";
 			$query .= "WHERE ". $file_type .".id= '".$db->quote($_REQUEST['id'])."'";
@@ -187,7 +189,7 @@ else {
             	header("Content-type: application/octet-stream");
             	header("Content-Disposition: attachment; filename=\"".$name."\";");
 			}
-            
+
 		}
 		// disable content type sniffing in MSIE
 		header("X-Content-Type-Options: nosniff");
diff --git a/files.md5 b/files.md5
index 941761c5..d8cb604c 100644
--- a/files.md5
+++ b/files.md5
@@ -1,5 +1,5 @@
 <?php
-// created: 2012-06-06 13:11:59
+// created: 2012-07-18 11:24:30
 $md5_string = array (
   './LICENSE.txt' => 'd3f150e4a5bed444763ebe8a81742a95',
   './.htaccess' => 'd41d8cd98f00b204e9800998ecf8427e',
@@ -12,7 +12,7 @@ $md5_string = array (
   './include/SugarObjects/SugarRegistry.php' => '9983aad8fa1c984c64d2c8e439851cee',
   './include/SugarObjects/VardefManager.php' => '798628a21af15a4257f21be0ab51aaf4',
   './include/SugarObjects/SugarSession.php' => '3f1cdefe0f810a15ef344e0086905be5',
-  './include/SugarObjects/templates/file/vardefs.php' => '81f815a15f18abdbe64166ffbc0604a3',
+  './include/SugarObjects/templates/file/vardefs.php' => 'cc7113aa9fb7713ce89be4bb35b061d5',
   './include/SugarObjects/templates/file/icons/Createfile.gif' => '3ed1d93938f715b1af93c0e99e900af5',
   './include/SugarObjects/templates/file/icons/file_32.gif' => '16b6a44601f20a651d1c83dc1a020c12',
   './include/SugarObjects/templates/file/icons/file.gif' => 'a577b65a0589e748d18aa1baef4e05c6',
@@ -31,7 +31,7 @@ $md5_string = array (
   './include/SugarObjects/templates/file/language/application/en_us.lang.php' => '4b510f1c470d9f4a7bf1791d47d36c83',
   './include/SugarObjects/templates/file/File.php' => '2e2ceb1a921678171d05c8202c634279',
   './include/SugarObjects/templates/issue/config.php' => '92befb45176ef9d23be2f27f0ac59fc6',
-  './include/SugarObjects/templates/issue/vardefs.php' => '310ed3fb5f832ca426e4ae7d8671f465',
+  './include/SugarObjects/templates/issue/vardefs.php' => '99dd64799ba8c7c5a04013dd35feeaa3',
   './include/SugarObjects/templates/issue/Issue.php' => '5633c4b2e0f5fa321458e155f4d18c75',
   './include/SugarObjects/templates/issue/icons/issue.gif' => 'b991bb74ff3c649b1f6592a4f3c6c114',
   './include/SugarObjects/templates/issue/icons/Createissue.gif' => '269352232732ae705318612e960b9eba',
@@ -78,7 +78,7 @@ $md5_string = array (
   './include/SugarObjects/templates/person/metadata/editviewdefs.php' => 'f9ad330e5504343bae231586a010a2a6',
   './include/SugarObjects/templates/person/metadata/SearchFields.php' => 'c00e75e1bce6083588e81f94993165d5',
   './include/SugarObjects/templates/person/metadata/popupdefs.php' => 'cfd688340e8909e639c9a547ba5302dc',
-  './include/SugarObjects/templates/person/metadata/subpanels/default.php' => 'b39a09b580f4d3bdc68b6ec11c5821d2',
+  './include/SugarObjects/templates/person/metadata/subpanels/default.php' => 'caa38f2c9ba9caeb1c9b426a865880a9',
   './include/SugarObjects/templates/person/metadata/listviewdefs.php' => '05ce4144900a1e6d3949cb3d50c0ea5d',
   './include/SugarObjects/templates/person/metadata/detailviewdefs.php' => '3345c1e3c927e0ed0ba010cb0cc7fdfe',
   './include/SugarObjects/templates/person/language/en_us.lang.php' => '03d26660f443329319c29b1bd14c478d',
@@ -272,18 +272,18 @@ $md5_string = array (
   './include/HTMLPurifier/LICENSE' => 'a1b3d3e45e8422eed104489842a6f546',
   './include/HTMLPurifier/CREDITS' => 'a5f9ddecea015543001404c0a9bfd181',
   './include/SugarHtml/SugarHtml.php' => '058c02dae665d65a0c630927988e9594',
-  './include/SubPanel/SubPanelTiles.js' => 'cc59ac3771c661dc76ade6de4e36d2a8',
+  './include/SubPanel/SubPanelTiles.js' => 'cc46637bcf0873d50a36ad07b4552eb9',
   './include/SubPanel/SugarTab.php' => '398584e6128906ecf4b4b5154ced95ee',
   './include/SubPanel/SubPanelDynamic.html' => '4f74fcd4211256ec95d0054799608906',
   './include/SubPanel/tpls/singletabmenu.tpl' => '252c751fac27affd042dc7ba1ee83a00',
-  './include/SubPanel/SubPanelDefinitions.php' => '7cf848143cd6ee9192e7a69b1e6f1b4e',
-  './include/SubPanel/SubPanelTiles.php' => 'a80d97ef12d641628789787ea8505c82',
+  './include/SubPanel/SubPanelDefinitions.php' => '78199f5f0bfe90e1fb1c76afe776e72d',
+  './include/SubPanel/SubPanelTiles.php' => '846a7239e5d40b60e8e611c443db6aaf',
   './include/SubPanel/registered_layout_defs.php' => 'd71c8000fd9dabffa19a3711f60c0f39',
   './include/SubPanel/SubPanelViewer.php' => 'de240547489fe04b229caa2c5fc34e61',
-  './include/SubPanel/SubPanel.php' => 'a8662b2cfced1d600156dc4775f33b85',
+  './include/SubPanel/SubPanel.php' => '22713e2b27e94ce43af75048b4694394',
   './include/SubPanel/SubPanelTilesTabs.php' => 'eab9d983b2caae6009bd0a4e9f2f7e11',
   './include/SubPanel/subpanels.txt' => '6979f7aaf435a32e1aaedb1b02c5361e',
-  './include/SugarFolders/SugarFolders.php' => '3a192be203b2c78e140d1ddbc1946054',
+  './include/SugarFolders/SugarFolders.php' => '60c83391f2f73bff568d1af2f25259a7',
   './include/json_config.php' => 'b14ab9be033480aa03fd2d43aab52591',
   './include/Sugarpdf/FontManager.php' => '35afc404d22ad40c6ab6e17e10bbc061',
   './include/Sugarpdf/SugarpdfHelper.php' => '78dacf9ebbb811053a28674409a36df7',
@@ -292,7 +292,7 @@ $md5_string = array (
   './include/Sugarpdf/Sugarpdf.php' => '7e44d3d7308df3c1e5fad15c776c88ee',
   './include/Sugarpdf/sugarpdf_default.php' => '7f19994bcf11b5d98801c3739eab57a2',
   './include/Sugarpdf/sugarpdf_config.php' => '3768422dd5bfb14aca352ea209a0ebae',
-  './include/clean.php' => 'bb50c52576e7d8a5086707080a9abc22',
+  './include/clean.php' => 'e95a4b6caeb54b3064cda0c7748dd3be',
   './include/externalAPI/ExternalAPIFactory.php' => 'bf19d1488383255a10e1c399529c5e5d',
   './include/externalAPI/cmis_repository_wrapper.php' => 'ff3bb54e2abd73334bb05df8b6920b8d',
   './include/externalAPI/Base/WebDocument.php' => 'ede22580002f6416a2502dee7d0be18f',
@@ -327,7 +327,7 @@ $md5_string = array (
   './include/SugarFields/Fields/Parent/SugarFieldParent.php' => '80f9e10a8ab4b9737868ffb57a216214',
   './include/SugarFields/Fields/Parent/DetailView.tpl' => 'c0134de64f17b6498188d2e5bfabe9e6',
   './include/SugarFields/Fields/Parent/EditView.tpl' => '47e05b9114e71505111b4e36a95224f9',
-  './include/SugarFields/Fields/Parent/SearchView.tpl' => 'e954dfff5a3866d502ba5de2d7b999c7',
+  './include/SugarFields/Fields/Parent/SearchView.tpl' => 'a2bb1f4f1dc225d43e7bff58d6986a76',
   './include/SugarFields/Fields/Fullname/SugarFieldFullname.php' => 'cf2903b1f2bf62b5e51a026e823407f4',
   './include/SugarFields/Fields/Fullname/DetailView.tpl' => 'f61a51cd909a6ca2dd5b12bd9353ec96',
   './include/SugarFields/Fields/URL/DetailView.tpl' => 'a395f28984d91136ec4d20623dd3b960',
@@ -339,7 +339,7 @@ $md5_string = array (
   './include/SugarFields/Fields/Text/DetailView.tpl' => 'cbf8e46def8846161dbc6ccfd8e4ee1b',
   './include/SugarFields/Fields/Text/EditView.tpl' => '26aa7313fd3fe83db6f16c1de80a2823',
   './include/SugarFields/Fields/Text/ClassicEditView.tpl' => 'b0b4eba7ded342f4b26d79d4b8c3a723',
-  './include/SugarFields/Fields/Datetime/SugarFieldDatetime.php' => 'a610455f74556ca75f21ecf463eecf19',
+  './include/SugarFields/Fields/Datetime/SugarFieldDatetime.php' => '4d6c3b36c232f8ee13caab372e8b39f2',
   './include/SugarFields/Fields/Datetime/DetailView.tpl' => 'e3e120879999863cb33a07bc36aedf04',
   './include/SugarFields/Fields/Datetime/EditView.tpl' => '427c55fa793f553e071940f3a067e130',
   './include/SugarFields/Fields/Float/SugarFieldFloat.php' => '8452804572e9a4aa4c711a22530a65f9',
@@ -353,15 +353,15 @@ $md5_string = array (
   './include/SugarFields/Fields/Password/EditView.tpl' => 'aa42f8ace5d954a82a0cecd46b9fd549',
   './include/SugarFields/Fields/Relate/DetailView.tpl' => '256e3bfa0a77434237fad67fee60d0d6',
   './include/SugarFields/Fields/Relate/EditView.tpl' => '6fd3f5f47d2908588f15ce55c347fb4a',
-  './include/SugarFields/Fields/Relate/SugarFieldRelate.php' => 'ce4af192ac7799c8686b14a747227a05',
+  './include/SugarFields/Fields/Relate/SugarFieldRelate.php' => '7e609408b86d29d7214da9aa374cc838',
   './include/SugarFields/Fields/Relate/SearchView.tpl' => 'ceca0856d893a7ae78cecd35b95fcff9',
   './include/SugarFields/Fields/Phone/SugarFieldPhone.php' => '4f5d715e5ce3fde8d43d669ab0edc0d1',
   './include/SugarFields/Fields/Phone/DetailView.tpl' => 'ce6b524b3132e8c3712f28baee4a97f8',
   './include/SugarFields/Fields/Phone/EditView.tpl' => 'a1632f6042dce3fbd4ed3319df131482',
   './include/SugarFields/Fields/Phone/ListView.tpl' => '1d072c0d32ed66aba1b7d7a4a635e07a',
-  './include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => 'ea067d18cc2c013f254c7733eab1645e',
+  './include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => 'b061cfcafa73da70b4cd297367d94e35',
   './include/SugarFields/Fields/Datetimecombo/RangeSearchForm.tpl' => '1e3b90f82507ece35ab90abff047a117',
-  './include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php' => '9b6aa4667dbb6827f59c0c543a47aa40',
+  './include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php' => '2a87aef9aba605ade492223e126e86b3',
   './include/SugarFields/Fields/Datetimecombo/EditView.tpl' => '04aad57b92d7039a11132845be4a0a47',
   './include/SugarFields/Fields/Datetimecombo/SearchView.tpl' => '06b6d8acd48103d3efd8b09941e7a056',
   './include/SugarFields/Fields/Radioenum/DetailView.tpl' => '2e04924e0c2b2721b3bf8f22a87b91a3',
@@ -418,7 +418,7 @@ $md5_string = array (
   './include/SugarFields/Fields/Bool/ListView.tpl' => '5f73d5bd7cacfd65bad854233e047ba9',
   './include/SugarFields/Fields/Bool/SearchView.tpl' => '9c8592506c90c954dd391d1d64c6275e',
   './include/SugarFields/Fields/Link/DetailView.tpl' => 'eb45da03fde2daf0117689ab89796e48',
-  './include/SugarFields/Fields/Link/EditView.tpl' => 'c9e4ab8abaddb4969e86b6987046eb3b',
+  './include/SugarFields/Fields/Link/EditView.tpl' => 'b9cc17dfa74f1b0dfe3d1477ed1a53c8',
   './include/SugarFields/Fields/Link/ListView.tpl' => '7c270602f574831777df3a3ed144902a',
   './include/SugarFields/Fields/Assigned_user_name/EditViewFunction.tpl' => '96a2ac343cfd852061059e16285f3cd5',
   './include/SugarFields/Fields/Assigned_user_name/SugarFieldAssigned_user_name.php' => '57e6fa57d7b1c109fd276a047c4dc0b1',
@@ -475,8 +475,8 @@ $md5_string = array (
   './include/SugarCharts/swf/groupByChart.swf' => '2eca03fe41128001349bacf997b1fedc',
   './include/SugarCharts/SugarChartFactory.php' => '4873cc48dd3a2258af3a7998713b2398',
   './include/SugarCharts/JsChart.php' => '7b9cc434a65f3551fcd87d3f85262de5',
-  './include/SugarCharts/SugarChart.php' => 'a551346035c18f76148259f0ce132b09',
-  './include/SugarCharts/Jit/js/sugarCharts.js' => '5206ef68ccb430a9749c6d55f6e68f18',
+  './include/SugarCharts/SugarChart.php' => '2a4c44bac5f8b760705e2830903e1743',
+  './include/SugarCharts/Jit/js/sugarCharts.js' => '643ed60792a2efe2c62c6ee3f094d735',
   './include/SugarCharts/Jit/js/mySugarCharts.js' => '6b3dd85fe7c6d5714b6d12c63e536982',
   './include/SugarCharts/Jit/js/Jit/jit.js' => 'a9f9f3efa0c6d7af942edbd3cddf9833',
   './include/SugarCharts/Jit/tpls/chart.tpl' => '035936b0a337a1b52edccffcd6e44e65',
@@ -493,11 +493,11 @@ $md5_string = array (
   './include/utils/logic_utils.php' => '56a0f7278ce71af00d53cb06c792b841',
   './include/utils/LogicHook.php' => 'ceeaf8d2efd82f52f34fa0d2af84fd27',
   './include/utils/external_cache.php' => 'a0e044ccf54743fddb2da7b1d6208a07',
-  './include/utils/file_utils.php' => '4fcb274ebefb72f611440dcf016c1ae8',
+  './include/utils/file_utils.php' => '4ed4e1602b833c7241d445dc65e54bbd',
   './include/utils/array_utils.php' => 'cd219555951987e06bee9321e57ab9db',
-  './include/utils/sugar_file_utils.php' => 'c5ac04cc61fcd8b9e127105a56aba441',
-  './include/utils/security_utils.php' => '1d7299533b136af8ac2d6448c93c34c1',
-  './include/utils/autoloader.php' => '4673510d7522252f1236bee6aa36a98c',
+  './include/utils/sugar_file_utils.php' => 'b3e4a66abdd308c57b7462b5ac17c5ad',
+  './include/utils/security_utils.php' => '4563448e6bd5ea91fb660931aaf0d25a',
+  './include/utils/autoloader.php' => 'c1952e61502de01020cac7f1ec52fb55',
   './include/utils/db_utils.php' => 'f8b684cdd8bbbf68cb3bd333cae5ac3f',
   './include/utils/encryption_utils.php' => 'aed0886450487779feb6612dae1b68c9',
   './include/utils/activity_utils.php' => '489f37be89640717f8e6d0122fd9b8e7',
@@ -572,9 +572,9 @@ $md5_string = array (
   './include/nusoap/license.txt' => '25823f4a2e463ab2c6b5873f07e428e1',
   './include/nusoap/class.wsdl.php' => 'cd7f1a43ca08891ac1ce04d4d1282c49',
   './include/nusoap/class.soap_val.php' => '084a898ecf261c201427fd41d4ee40e0',
-  './include/utils.php' => '7e01e23b22e938f9466700fb02fc8968',
+  './include/utils.php' => '0e9d69bfddcf81c81a4ca9c6aa68bbc9',
   './include/SugarHttpClient.php' => '87fa99a397caaaceb121a21d91ed5260',
-  './include/Sugar_Smarty.php' => 'ac26b79b198a41180bdfd39170974f95',
+  './include/Sugar_Smarty.php' => 'ac140125309e194a7f43747d41417cd4',
   './include/phpmailer/class.smtp.php' => '64255208cd6f263a69d58918dcb7138d',
   './include/phpmailer/README' => '9522b5930919ec251b6f4edda0584480',
   './include/phpmailer/license.txt' => '278f2557e3b277b94e9a8430f6a6d0a9',
@@ -601,22 +601,24 @@ $md5_string = array (
   './include/phpmailer/language/phpmailer.lang-ca.php' => '228a8e6e6eb5fee58942f5d0740314ce',
   './include/phpmailer/language/phpmailer.lang-br.php' => 'd294ef50bd7d57e70e866a7618528048',
   './include/phpmailer/class.phpmailer.php' => 'a78d163362a44ff475e9141c3c75ed99',
-  './include/php-sql-parser.php' => '3abaa35d1b42c94523fc2e7ce5ae677c',
-  './include/database/DBManager.php' => 'b36bfa8d8f46200885db0d574b8303d1',
+  './include/php-sql-parser.php' => '4fd316e1251bd1134a46134ad7ddaf57',
+  './include/database/DBManager.php' => '9a60fc7b5ac377121f8817b617c566e9',
   './include/database/MysqlHelper.php' => '6081c98891b401e3653bde7ec539b6d9',
   './include/database/DBHelper.php' => '74b36f164c288872a50d1f6132d4875e',
-  './include/database/MysqlManager.php' => '973775a669bf53b66cfd5c5002517b36',
+  './include/database/MysqlManager.php' => '968d27d3e911f4e34bed9a9aa24f19d6',
   './include/database/MysqliManager.php' => 'e88b97697ac552f936ab5fc78b2ddb17',
   './include/database/FreeTDSHelper.php' => '06d0b4b1635e1c87d6afae4a022f8374',
   './include/database/FreeTDSManager.php' => '80806583dcc9546d5c00fa77e4c6a15b',
   './include/database/MssqlHelper.php' => '6b3a36ab4462e0f838c35e0e74e0f02b',
   './include/database/DBManagerFactory.php' => '021c6c562cd96f304544af0e336dc736',
   './include/database/SqlsrvManager.php' => '4a3d6c5e56ae8fe5fdb07ead522c324e',
-  './include/database/MssqlManager.php' => '52457d5abd19024c1df5c2e1aa027c54',
+  './include/database/MssqlManager.php' => 'b7090f5ff68358bdf040bb1b979e54b9',
   './include/timezone/timezones.php' => '15844342704f03ef8d40603abe9aa99b',
   './include/SugarSQLValidate.php' => 'eb288af9ccb9828370ef3999ad926619',
   './include/connectors/ConnectorFactory.php' => '33d27fc539bbd684cf7deb0cea6ed37d',
-  './include/connectors/utils/ConnectorUtils.php' => '234ce65767325a49bb3c11323c5062a4',
+  './include/connectors/utils/ConnectorUtils.php' => 'e0f8c33d5ab473259db9c246f169b23b',
+  './include/connectors/utils/ConnectorHtmlHelperFactory.php' => '992e79942eb00bdd0e2fe071d61ef652',
+  './include/connectors/utils/ConnectorHtmlHelper.php' => '9933bf6a050cb1d439f3f3c97c737a6f',
   './include/connectors/component.php' => '95c819efe3484a6d1dcba9aefbb4ce0e',
   './include/connectors/filters/default/filter.php' => '45977b4a20344dccb602ece1e48e50d1',
   './include/connectors/filters/FilterFactory.php' => '8b1dd8be358b3c9401383fa9adbb94e5',
@@ -634,14 +636,14 @@ $md5_string = array (
   './include/QuickSearchDefaults.php' => '9f56b8460ccbc0e7200469b24ceb9e41',
   './include/Popups/tpls/footer.tpl' => 'cda2c59d64c7135b261e145856bb3e5d',
   './include/Popups/tpls/header.tpl' => '82b7b2df20533719b3b2585158e37b5f',
-  './include/Popups/tpls/PopupGeneric.tpl' => '4adfbbf1f98cd5168945e34bae212592',
+  './include/Popups/tpls/PopupGeneric.tpl' => '8a376cc11e38482a3c3bf6ff18e8b5ff',
   './include/Popups/PopupSmarty.php' => '291a228a7cd7277c965353cf733af8e3',
   './include/Popups/Popup_picker.php' => '021273a0792c4a8469f9f9fb6839df31',
   './include/templates/TemplateDragDropChooser.php' => '312be77f2351b29f7e79bf416ddd8772',
   './include/templates/Template.php' => '36ef9b944d7e36d9853d9879f6194969',
   './include/templates/TemplateGroupChooser.php' => '6ae99e0ff3795b613d03ec0474e52c46',
   './include/TemplateHandler/TemplateHandler.php' => 'a8d26ccbe311238a6c52674d51470a4d',
-  './include/SugarTheme/SugarTheme.php' => '3a340e686158ee6cf15425929912340f',
+  './include/SugarTheme/SugarTheme.php' => 'cf9766ea68d6faab44025adde04320b6',
   './include/SugarTheme/getImage.php' => '0cdce763d79863dcdfc6b9e1b13a3516',
   './include/SugarTheme/SugarSprites.php' => '10818287a033eed727e4269522cc7044',
   './include/SugarTheme/cssmin.php' => '05384ba957435def09368425e4480688',
@@ -649,11 +651,11 @@ $md5_string = array (
   './include/SugarDependentDropdown/javascript/SugarDependentDropdown.js' => '4d077b3991c83098e4bca166bc715071',
   './include/SugarDependentDropdown/SugarDependentDropdown.php' => '86eb13e7c54068ec87679e98a4e0d406',
   './include/export_utils.php' => '885a0dd6cda051658520a90f522f787f',
-  './include/globalControlLinks.php' => '8d548a16882a95dd9395b78fc8489951',
+  './include/globalControlLinks.php' => '7023363f444dd1d4ba94cab9bf1a471d',
   './include/SugarTinyMCE.php' => 'a00a969d2a2df9dbbc80ead4af9b40de',
   './include/tabs.php' => '7cf9418691424c673218c535fec27a05',
   './include/SugarOAuthServer.php' => '2213c81d7cef1884997b4a0d38216fd9',
-  './include/modules.php' => 'cc74f453cc53bfef750bad24f748e8ff',
+  './include/modules.php' => 'a64f7525c9d97259c30cffa9f9775ec2',
   './include/ytree/treeutil.js' => '5498771efdcf4dadc73e92b0f4104f5e',
   './include/ytree/Node.php' => '0d8128f302dd73eefa4fde69958058f7',
   './include/ytree/Tree.php' => 'a0ea3ec1335e16723b0b1a6d6e673f33',
@@ -724,13 +726,13 @@ $md5_string = array (
   './include/ytree/TreeView/css/check/tree.css' => '0eb57b9c70f75ca706fbab4e29ac2ad7',
   './include/ytree/TreeView/css/forecasts/tree.css' => '59797a1f43dc5602932f826d687d398f',
   './include/GroupedTabs/GroupedTabStructure.php' => '9b88d71d41cb5beb67e5a7344101f537',
-  './include/EditView/SubpanelQuickCreate.php' => '97329858f4ea45e9ea681bebcebc5b92',
+  './include/EditView/SubpanelQuickCreate.php' => 'd57a15fb747f7247f2b9d77cd86064be',
   './include/EditView/footer.tpl' => '8bef7a56d0a1413d935094347ef96538',
   './include/EditView/SugarVCR.php' => '6a0a3aaddb7889a8d618a4aede4d6d90',
   './include/EditView/header.tpl' => 'a784dee4bebb0dca1239e26ec927a264',
   './include/EditView/QuickCreate.tpl' => 'fa3dacaca4c4985fa7d4e19e44d8a30a',
   './include/EditView/EditView.php' => '585450ac1a175834d05e944f77364c17',
-  './include/EditView/EditView2.php' => '2eaea8e86b917d3aa848dc3153223fb8',
+  './include/EditView/EditView2.php' => '3ea04ba5587d3af157c4d425e19f246c',
   './include/EditView/PopupQuickCreate.php' => '9a8b7a895799ed90058b3e070ad7f672',
   './include/EditView/EditView.tpl' => '5b4cda504eee219faaf08af37af191c1',
   './include/EditView/QuickCreate.php' => 'a4351f400593c2a1933176d8e34bc82c',
@@ -775,7 +777,7 @@ $md5_string = array (
   './include/tcpdf/CHANGELOG.TXT' => 'b41664d05748e067b3d52ba1eba1e9c3',
   './include/tcpdf/tcpdf.php' => 'e1032f914233be45b287bbb29bdfb452',
   './include/tcpdf/README.TXT' => 'f64835b5e9149a89515a9eb589d13a38',
-  './include/javascript/ajaxUI.js' => '61452824c5e7e7515646a30deaaf6628',
+  './include/javascript/ajaxUI.js' => '2355a161085c71249ce4abc4ce3ff858',
   './include/javascript/calendar.js' => '74fcfcacbdf160e7eb749d7697ad8788',
   './include/javascript/iscroll.js' => 'f6b1477d2416ee1c40578d56c89220c1',
   './include/javascript/include.js' => 'f3ef613992bd21dcb9a6033c03675b90',
@@ -786,11 +788,11 @@ $md5_string = array (
   './include/javascript/sugar_yui_overrides.js' => '2044e4ff54670e82359c21cca12b2dd5',
   './include/javascript/cookie.js' => '88a6745e90f7c043394eca8b106068b2',
   './include/javascript/popup_parent_helper.js' => '592953cb14307a0ce288261d40c4f8a9',
-  './include/javascript/sugar_3.js' => 'ba84ea419068fac8e832ac9fab2d33e9',
+  './include/javascript/sugar_3.js' => '853a96a821de7a2e0b0850bf49eabc87',
   './include/javascript/jquery.js' => '819fb9d29c24f79d34343e9f182aaf24',
   './include/javascript/sugar_connection_event_listener.js' => '27234843e68e64fc9c399044619320be',
-  './include/javascript/jsclass_async.js' => 'd725c16df9803e561437c4a2e13d1372',
-  './include/javascript/quickCompose.js' => 'a603ec474b1158d0df4992790e936437',
+  './include/javascript/jsclass_async.js' => 'ee2946c0fbf3d8f941657be6bd1b6c9c',
+  './include/javascript/quickCompose.js' => '43694b8ad631b58dd9030925a99f5a15',
   './include/javascript/menu.js' => '1ee25f32c6da30d39facf4e8ccbce531',
   './include/javascript/importWizard.js' => '181b53a6248a2b8db6cf03cd2c4c2c66',
   './include/javascript/jsclass_base.js' => 'f3375a1e38ada7c4bdd1b498c9993cc3',
@@ -850,7 +852,7 @@ $md5_string = array (
   './include/javascript/jquery/themes/base/jquery.ui.base.css' => '61035f9b4c191adb57badc1f558f4bc3',
   './include/javascript/jquery/themes/base/jquery.ui.accordion.css' => '4a87fc350a66bd0c9179eb9554e1cea0',
   './include/javascript/jquery/jquery.hoverIntent.js' => '0aaea26d96fc385b1540879c41c2b2dd',
-  './include/javascript/jquery/jquery.sugarMenu.js' => '06f0b53999c2c6f05e00d47bec72f115',
+  './include/javascript/jquery/jquery.sugarMenu.js' => '7fcfff2632e3dc508892a3d07650fe8a',
   './include/javascript/jquery/jquery.superfish.js' => 'decbe8f5b51bf16e3750da2c41d9265c',
   './include/javascript/jquery/jquery.showLoading.js' => '573787c855a3389081b878302f905df7',
   './include/javascript/sugarwidgets/SugarYUILoader.js' => 'c8198074c79a9df405d87800127c4e96',
@@ -2545,8 +2547,8 @@ $md5_string = array (
   './include/MVC/View/views/view.noaccess.php' => '25d3b1cabcc3ce86d9110214f67bb862',
   './include/MVC/View/views/view.vcard.php' => 'b28901f6dd26f4b92c82a50b562610fb',
   './include/MVC/View/views/view.multiedit.php' => '14e60eed1da6bdd4484a9fba241ac7a0',
-  './include/MVC/View/views/view.list.php' => '446f23cc7bf85cabf9378b25d6e05a1a',
-  './include/MVC/View/views/view.popup.php' => '36ad1b92062a221c6e0e4eb5f79f9f9a',
+  './include/MVC/View/views/view.list.php' => '3d73c1e5d7d7310bb54cf1a8ca7b0e28',
+  './include/MVC/View/views/view.popup.php' => 'e7269ffc993b42942c3441a3e63f4e20',
   './include/MVC/View/views/view.quick.php' => '4c1fda7615101d7c9a11af7e9c495289',
   './include/MVC/View/views/view.xml.php' => '5ca6f033ae95a3d8d7eacbaaac86d58a',
   './include/MVC/View/views/view.sugarpdf.config.php' => '85c23b2aa8b6af2b82efc3eae453a118',
@@ -2554,7 +2556,7 @@ $md5_string = array (
   './include/MVC/View/views/view.importvcard.php' => 'fd7a69f7fb258ce490acbf0334b263f9',
   './include/MVC/View/views/view.ajaxui.php' => '2b6496589d96202d453cb98ffbc51d3a',
   './include/MVC/View/views/view.classic.config.php' => '5d90625b2648beb884b29c10a076b1fe',
-  './include/MVC/View/views/view.edit.php' => 'd6e43b8556b66192ee8a95a81c793321',
+  './include/MVC/View/views/view.edit.php' => 'c815bae865c215630d964e590db57aca',
   './include/MVC/View/views/view.serialized.php' => '40e61a7baacf410ecbcd680ddaf9c460',
   './include/MVC/View/views/view.modulelistmenu.php' => '335182388522588add94bd462f3e19af',
   './include/MVC/View/views/view.ajax.php' => '70f8fa27884cd2d77a7f64e9de957a1f',
@@ -2563,11 +2565,11 @@ $md5_string = array (
   './include/MVC/View/views/view.sugarpdf.php' => 'ebcfcb7fb254d8a671a584528e495e1a',
   './include/MVC/View/views/view.json.php' => '485c56b29adf66aaabe28e259f325588',
   './include/MVC/View/views/view.classic.php' => '36203ddc3461f3b8c2e24f2c2dbe69e3',
-  './include/MVC/View/views/view.detail.php' => 'b392814e6da151932d176f8c210d093f',
+  './include/MVC/View/views/view.detail.php' => 'bd0d0ff2a23f06455082c98a0a058857',
   './include/MVC/View/ViewFactory.php' => '56116e594364b8a34b3d8986e93fce1e',
-  './include/MVC/View/SugarView.php' => '4ac436e24e45cb9714b41a755cca79d1',
+  './include/MVC/View/SugarView.php' => 'ed5c6cb004cb28478d409b806f6bd6ce',
   './include/MVC/SugarModule.php' => '1d53f536613de51c996600e26c14ca97',
-  './include/MVC/SugarApplication.php' => '0ab99c48aa7063737aa11b9e3038a820',
+  './include/MVC/SugarApplication.php' => 'a3267786d2ea203ab5c027aae36c8d1d',
   './include/MVC/Controller/file_access_control_map.php' => '6bf1388c2830450cb92d8b9e374a04d5',
   './include/MVC/Controller/entry_point_registry.php' => '5b7aef0d506fb3cf9d635e49f714d7ed',
   './include/MVC/Controller/SugarController.php' => 'bdea5e50de511437f75f0f4f093afeb3',
@@ -2581,8 +2583,8 @@ $md5_string = array (
   './include/SearchForm/tpls/SearchFormGenericAdvanced.tpl' => 'f8d8d9a835a80ce85bcd0b6b801ad7cf',
   './include/SearchForm/tpls/SearchFormGeneric.tpl' => '2e5f84f3de4d7e15d122e57253acfa91',
   './include/SearchForm/SugarSpot.php' => 'a899046092d8a1bdb1fd93352b209ab4',
-  './include/SearchForm/SearchForm.php' => '3c52df41f9b91e20ce5a76323bb77f44',
-  './include/SearchForm/SearchForm2.php' => '54cc8968c5a0b32a6be9c81adfba59d6',
+  './include/SearchForm/SearchForm.php' => '37a79061b1ef9fc6be0ada54cf4b9a9b',
+  './include/SearchForm/SearchForm2.php' => '546d9c9b9b66e4b84185c99bc0d1a927',
   './include/Dashlets/DashletRssFeedTitle.php' => '10771bdc817e8ae49e4a9938d2bcf9d8',
   './include/Dashlets/DashletGenericAutoRefreshDynamic.tpl' => '355b7490fa2339a87e1fbc7e479dfb73',
   './include/Dashlets/DashletCacheBuilder.php' => 'a0c56547321767e6b599f98293d2fa39',
@@ -2602,17 +2604,17 @@ $md5_string = array (
   './include/Pear/XML_HTMLSax3/LICENSE' => 'a45bb1bbeed9e26b26c5763df1d3913d',
   './include/Pear/XML_HTMLSax3/HTMLSax3.php' => '11107d97b19feb13feb394cd858603f0',
   './include/ListView/ListViewSmarty.php' => '533ed60d9946ad26872a0004e9519b9f',
-  './include/ListView/ListViewData.php' => '6ce5c152f6274d5b991790059486e98b',
+  './include/ListView/ListViewData.php' => 'b9721e6b1f1288904b956923b8fb287c',
   './include/ListView/ListViewGeneric.tpl' => '6f867b08c99260c7b7ec669c2c85249a',
-  './include/ListView/ListView.php' => '06eb71bf200ca959984df33dc631924a',
+  './include/ListView/ListView.php' => '8cf251743fedb9c81a8310cac2056366',
   './include/ListView/ListViewFacade.php' => 'e82b5372d43acd05f1dbe5855c40cdbd',
   './include/ListView/ListViewDCMenu.tpl' => 'e7f7ad82a50d2998a933c7e8c333c080',
   './include/ListView/ListViewXTPL.php' => '5fff1f22e74a373c216a5358e9be1aae',
-  './include/ListView/ListViewPagination.tpl' => '4e872c4c80c16572a07094349132f31b',
-  './include/ListView/ListViewDisplay.php' => 'd12807876aff4f1336d748425a5c39bf',
+  './include/ListView/ListViewPagination.tpl' => '7831c73ab8e79132b8af690956cf9d82',
+  './include/ListView/ListViewDisplay.php' => 'a7a82261525d89a7247eea8e591db9aa',
   './include/ListView/ListViewNoMassUpdate.tpl' => '979476d174c8fa58af325195f03a3b29',
   './include/vCard.php' => 'b9b49b4d676cbb05c00771e037687ef3',
-  './include/upload_file.php' => 'df7b3b994bc7703e471b62a5ab7a7598',
+  './include/upload_file.php' => 'f380b6ee4714d8977994b07f1c1bcf17',
   './include/controller/Controller.php' => 'c5d723fc98af89861c9e68ae49ac9fee',
   './include/formbase.php' => '46189b0cab499a78ffc418c728343008',
   './include/SugarOauth.php' => 'e9c19b3799b9f64560a80eb1523144f8',
@@ -2621,7 +2623,7 @@ $md5_string = array (
   './include/resource/Observers/ResourceObserver.php' => 'd93dc69d2372859fe8fb0f1068587d54',
   './include/resource/Observers/SoapResourceObserver.php' => 'bff762397d04d958883d06ed160d8bd1',
   './include/language/jsLanguage.php' => '3aade005a1d8758085838ed1a22ebf34',
-  './include/language/en_us.lang.php' => '5474da0856250dd15983781a8882fad8',
+  './include/language/en_us.lang.php' => 'f4cddbdc89b3e204c241ddb32e5f14ef',
   './include/language/en_us.notify_template.html' => 'd443be0488e3ce72c2e10984e891d275',
   './include/pclzip/readme.txt' => '2265cad9ccb84cfcd4093ce26b22dc97',
   './include/pclzip/gnu-lgpl.txt' => '7fbc338309ac38fefcd64b04bb903e34',
@@ -2673,7 +2675,7 @@ $md5_string = array (
   './include/Smarty/plugins/function.sugar_getimagepath.php' => 'f95c722408c0860608c3cfdaf41ca57c',
   './include/Smarty/plugins/function.fetch.php' => '23aea2dfaba739298fe7ed0fa667efdb',
   './include/Smarty/plugins/modifier.date_format.php' => '779b980e5296f6e0814b26940c69afb8',
-  './include/Smarty/plugins/function.sugar_number_format.php' => '11a1900821c4ba7b1621f2ee39a69aa2',
+  './include/Smarty/plugins/function.sugar_number_format.php' => '0c73f8df00d86c6ff4905dc0e600f412',
   './include/Smarty/plugins/function.sugar_getjspath.php' => '3cf86999678db475835f9cdee0cc5a00',
   './include/Smarty/plugins/function.sugar_fetch.php' => '6fd07816cbba8003cdb31d3ee067271f',
   './include/Smarty/plugins/function.popup_init.php' => 'bbf08a63f3a1ae2679b324d23cfce520',
@@ -2695,7 +2697,7 @@ $md5_string = array (
   './include/Smarty/plugins/function.popup.php' => 'cf231d09647d1b1cf0adf5904b66b6a6',
   './include/Smarty/plugins/function.sugar_variable_constructor.php' => '6561cdb5987f989d18090a4713c9a27a',
   './include/Smarty/plugins/function.sugarvar_connector.php' => 'c63e36be38618aeb5da1d3a54f5019b2',
-  './include/Smarty/plugins/function.sugar_menu.php' => '8509c3cbf47c29a30529de984c7f7d11',
+  './include/Smarty/plugins/function.sugar_menu.php' => '09163690aeddebb87508d2b6bc9d8ed4',
   './include/Smarty/plugins/function.sugar_translate.php' => '6c15cff8d615f848193726c8cd154b18',
   './include/Smarty/plugins/function.sugar_getscript.php' => '27ec71195a0e581d12dced7b669ca29f',
   './include/Smarty/plugins/function.counter.php' => '73d05c9943053b38780e3bb86bf74fd2',
@@ -2727,12 +2729,12 @@ $md5_string = array (
   './include/Smarty/plugins/function.sugar_evalcolumn.php' => '4a3bee9672c840cb602f36f8fc42c542',
   './include/Smarty/plugins/function.sugar_link.php' => '2495ebff2913647edfc2ac8c0322a9dd',
   './include/Smarty/plugins/compiler.append.php' => '19852716d0b872d80852a199fb5b6335',
-  './include/Smarty/plugins/function.sugar_action_menu.php' => 'f4c3d00aa99eb4e2b387fd720550feee',
+  './include/Smarty/plugins/function.sugar_action_menu.php' => '24ce7e294b7afcce890542931d89df86',
   './include/Smarty/plugins/block.textformat.php' => 'b0bebaca5693c6baf9332d22d6fbd1d1',
   './include/Smarty/plugins/modifier.lookup.php' => '40764bc28a9c155fffc65f60253c5b66',
   './include/Smarty/plugins/function.html_select_time.php' => '780246c13ff291a61a80e69a12690e4a',
   './include/Smarty/plugins/function.assign_debug_info.php' => '47b6d1f6e8411637af71925793a97efc',
-  './include/Smarty/plugins/function.sugar_phone.php' => '22871529b77a49a4dce9a7fcd7e4f670',
+  './include/Smarty/plugins/function.sugar_phone.php' => 'f0aca70b1d7fef4e31930a7e6b506687',
   './include/Smarty/plugins/function.multienum_to_array.php' => '402c543b8c0179e5e8f712dc304bf891',
   './include/Smarty/plugins/function.ext_includes.php' => 'e75b10578a7963fbd221d0e823471bc7',
   './include/Smarty/plugins/modifier.escape.php' => 'aae08c2908d653176d5cdcdae0a8cd97',
@@ -2755,33 +2757,33 @@ $md5_string = array (
   './include/DetailView/DetailView.php' => '3df8ccba8aca6dffb5969c47001d7435',
   './include/DetailView/DetailView2.php' => '4f800afa17ab95068341a3474e78fb76',
   './include/generic/DeleteRelationship.php' => '73e87c09bc4e90c35a551a6d290965c1',
-  './include/generic/Save2.php' => '0916bccf2d43cc61cbe16fde97212c0d',
-  './include/generic/LayoutManager.php' => '506ce846c7cfe2869ecc669055d1d84d',
+  './include/generic/Save2.php' => '3d75c8fc6a726c477b405cc663037077',
+  './include/generic/LayoutManager.php' => '48a5feb70ed0fc1f360d6ba9d917d139',
   './include/generic/SugarWidgets/SugarWidgetSubPanelEditRoleButton.php' => 'ffd2ba1b7c2b0124a3b70dc00009a94d',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php' => 'e700d6eeaef220777f1c6540ff4300aa',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php' => 'b6375e51b1f1f3b827c9aa300cdd065e',
   './include/generic/SugarWidgets/SugarWidgetFieldurl.php' => '8909a2b419250e770cd07129da34b6d7',
   './include/generic/SugarWidgets/SugarWidgetFieldcurrency.php' => '5a93ce41bb40b604c337bf2367491c9f',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateAccountNameButton.php' => 'be445affddc003efff8e6206031385a0',
   './include/generic/SugarWidgets/SugarWidgetFielddatepicker.php' => 'dee020ff9030fee04b450be6d2f57db4',
   './include/generic/SugarWidgets/SugarWidgetFieldchar.php' => 'ff4c04e9e87b53eabd82a38fe8c16e35',
-  './include/generic/SugarWidgets/SugarWidgetFieldmultienum.php' => '5d3a3920e2766828e3059431132ee026',
+  './include/generic/SugarWidgets/SugarWidgetFieldmultienum.php' => 'ef4f0eec6d7fb12bd9b76d9f26ce0cb6',
   './include/generic/SugarWidgets/SugarWidgetField.php' => '677f2d56818b2b35611e73799d80140b',
   './include/generic/SugarWidgets/SugarWidgetSubPanelIcon.php' => '2a22c376b999d71977dcbcf33b48941c',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopMessage.php' => 'a61dac690bca32a9da19652d34d277a5',
   './include/generic/SugarWidgets/SugarWidgetFieldvarchar.php' => 'e5b8d2c27312e5494f0020949e4d6d83',
   './include/generic/SugarWidgets/SugarWidgetFieldbool.php' => '36271858b5a70373b5d10004d146fd0c',
   './include/generic/SugarWidgets/SugarWidgetFieldlongtext.php' => '56e1f8cf36f90d42fec5eceac7c98a5c',
-  './include/generic/SugarWidgets/SugarWidgetFieldenum.php' => '3114fa9aebd0b40f9967663f8919ddb4',
+  './include/generic/SugarWidgets/SugarWidgetFieldenum.php' => 'cd5f2bf63051e5d2d26e6bdd7e6f3ac9',
   './include/generic/SugarWidgets/SugarWidgetFielddecimal.php' => 'de2b9da14bee9fb4a0fa6999c7cce7ea',
   './include/generic/SugarWidgets/SugarWidgetSubPanelGetLatestButton.php' => '76ce22a0b5906b3ceabcbd89a9c31e42',
   './include/generic/SugarWidgets/SugarWidgetFieldsingleenum.php' => '0338edf920bf35a9d965509024f94473',
   './include/generic/SugarWidgets/SugarWidgetSubPanelLoadSignedButton.php' => '1ec69a812e9d70198969fc8c753e6256',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php' => '57dc1a789e8800bb97eb5a8e65512725',
-  './include/generic/SugarWidgets/SugarWidgetFielddate.php' => 'bf200f01dbe67d14123f62db17a6e53f',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php' => '4a430d77f2f105f30d23876f63581076',
+  './include/generic/SugarWidgets/SugarWidgetFielddate.php' => 'efccab584bdb7950220abab57c1290aa',
   './include/generic/SugarWidgets/SugarWidgetFielduser_name.php' => 'ac7581e728a68f2f08292dd2ff53def4',
   './include/generic/SugarWidgets/SugarWidgetFieldid.php' => 'c8e80e951a61d6edbab6051cececa3c7',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopButtonQuickCreate.php' => '1ce1b452be1cdc45a915e788905c4a55',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php' => 'ceffffeeb554829ffed8764c2b7d5ead',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php' => 'b868f88892d0e23f4f430ede55cbb6c4',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopScheduleMeetingButton.php' => 'c2c7faa6003bf8ee8741c7a75aa7d73f',
   './include/generic/SugarWidgets/SugarWidgetFieldradioenum.php' => '0e82e38ab02f701c778bec444f4e93e5',
   './include/generic/SugarWidgets/SugarWidgetSubPanelActivitiesStatusField.php' => 'af2bbbbd647c9a72eaedda8647f4de5c',
@@ -2794,33 +2796,33 @@ $md5_string = array (
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateTaskButton.php' => '41ff34b662a6eb316a2d956fb5f427f4',
   './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonAccount.php' => 'c5b1a13e66b79b6a8308021610631417',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopScheduleCallButton.php' => '6fda8b596d6efe83cd15661df7f62fd3',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php' => '4b5c5aad7a13fc55302d1b2e3638070d',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php' => '9acf5f1603503d612bb0db14da3bf5ce',
   './include/generic/SugarWidgets/SugarWidgetSubPanelConcat.php' => '117fcbd405ba66a23b3bfc8659ebc5f0',
   './include/generic/SugarWidgets/SugarWidgetFieldtext.php' => '1782b8e9e2f92bce28cbc0e81b29aa9e',
   './include/generic/SugarWidgets/SugarWidgetFieldimage.php' => 'be83ceb388569857f4dc8cd12f597ec6',
-  './include/generic/SugarWidgets/SugarWidget.php' => '4166b86273d549665dba9add18ea7a20',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php' => '9aa168350513c495c0ef424233d2b278',
+  './include/generic/SugarWidgets/SugarWidget.php' => 'fa0def8d0108586cf8c82def4f8b9556',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php' => 'bc3b043e39991cf6309e84ef15286cbe',
   './include/generic/SugarWidgets/SugarWidgetFieldname.php' => '6080213ce66ff077b5b759c7e0b93e37',
   './include/generic/SugarWidgets/SugarWidgetFieldphone.php' => '2146ea9625d363284a00213492a2c512',
   './include/generic/SugarWidgets/SugarWidgetFielddouble.php' => 'dfea9a0c6a04f2377cea4c0f41fae6e1',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopSummaryButton.php' => '7f90a83211de47899a5ea77a7d3268f0',
   './include/generic/SugarWidgets/SugarWidgetFieldint.php' => 'c2407a956d99a478dfe359064cf2ef68',
   './include/generic/SugarWidgets/SugarWidgetFieldemail.php' => '4f719407583d000944b09238f838f691',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php' => '0418c8216ec91b0838022f99164c15ec',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php' => 'ec54235dabfc228e30a9724baa3417f0',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php' => '42dab3fe7c7514bd71eebafacf294ee6',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php' => '934a6ff7977d2b3501d1551e31445b3b',
   './include/generic/SugarWidgets/SugarWidgetSubPanelEditButton.php' => '396cf26585199d9f4709af3e21de089c',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php' => 'e5abf15373ffde766d6e35f05e5acb6a',
-  './include/generic/SugarWidgets/SugarWidgetReportField.php' => '14b211abee99ce2b82279c3145b43aff',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php' => 'eda0760a68c648b6924ff97e44d294e5',
+  './include/generic/SugarWidgets/SugarWidgetReportField.php' => '363e7e9cd65f94a2877e05bfcb3fc99d',
   './include/generic/SugarWidgets/SugarWidgetSubPanelCloseButton.php' => '8add175bc8b9b0576efc420c9211d7b1',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateNoteButton.php' => '3d0a6b29a27135a455a781a0a81e24f8',
   './include/generic/SugarWidgets/SugarWidgetFieldnum.php' => '15c06a35b7f2ee9f0a41716d5b6d393d',
-  './include/generic/SugarWidgets/SugarWidgetFieldrelate.php' => '9c6d426695f9636ebe92dc1c83bba3d5',
+  './include/generic/SugarWidgets/SugarWidgetFieldrelate.php' => '671e5fda243f814fb2d3afe9d7a0c1da',
   './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectAccountButton.php' => '7c46e299d2783d00cb36be8517100452',
-  './include/generic/SugarWidgets/SugarWidgetFielddatetime.php' => '7f9158c9dd065318fdc4c174942a5b2e',
+  './include/generic/SugarWidgets/SugarWidgetFielddatetime.php' => 'c60ab0c6bb2e9b0cbf2c04ff3488fe89',
   './include/generic/SugarWidgets/SugarWidgetSubPanelEmailLink.php' => '7b67281f140b86aad81ec6e817453467',
   './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonMeetings.php' => 'b122f559be91ce0a6ea228dc4c94b4c7',
   './include/generic/SugarWidgets/SugarWidgetFieldfloat.php' => 'c666c7874c49637db91c03b53abaa572',
-  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php' => '51e260f2df8a55c62fb15681261553cb',
+  './include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php' => '9567e8dd9dd600c63a1aa7a2bc8547ca',
   './include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButtonProjects.php' => '4c568d07ae9bc35c0e61b02aa1d09370',
   './include/generic/SugarWidgets/SugarWidgetFieldfullname.php' => '0f864cbd375ff831306ded8cbb3df426',
   './include/generic/SugarWidgets/SugarWidgetFielddatetimecombo.php' => '396fdadd308d80ae58390314c518dbda',
@@ -2865,13 +2867,13 @@ $md5_string = array (
   './HandleAjaxCall.php' => 'e8f0cb63050a3f85e26d5f295c54d8b6',
   './ModuleInstall/extensions.php' => '10a1d5b070ae6cfd47071a4a785ba231',
   './ModuleInstall/ModuleScanner.php' => 'f9cffaf03d000e24d37e2c77b695d35e',
-  './ModuleInstall/ModuleInstaller.php' => 'b9c41d59177d85bcdac87456cc9851bd',
-  './ModuleInstall/PackageManager/tpls/PackageForm.tpl' => 'f115e099b850b3b76f84aa47f7c0c7c2',
+  './ModuleInstall/ModuleInstaller.php' => '8b09838949b4e3c9bae139b607c81cdd',
+  './ModuleInstall/PackageManager/tpls/PackageForm.tpl' => 'b0f7f452c6c32251c1e88f3f06422018',
   './ModuleInstall/PackageManager/tpls/PackageManagerScripts.tpl' => '305b5d5a2ea5f04c533b982a5f1422ee',
   './ModuleInstall/PackageManager/tpls/ModuleLoaderListView.tpl' => '33005aa5481b731ec31fd6c15c173e78',
   './ModuleInstall/PackageManager/tpls/PackageManagerLicense.tpl' => '2525aa86dacd0b454092b5ea9c483c4a',
-  './ModuleInstall/PackageManager/PackageManager.php' => '5484f737652deaf7a1500814a6a39280',
-  './ModuleInstall/PackageManager/PackageManagerDisplay.php' => '5e31b13d4d7351c6132afeb26ce71302',
+  './ModuleInstall/PackageManager/PackageManager.php' => 'c63fb30ed73d61a9bf76218c54e61502',
+  './ModuleInstall/PackageManager/PackageManagerDisplay.php' => 'e2d2357b2a21cc34e7ca04adf867a526',
   './ModuleInstall/PackageManager/PackageManagerComm.php' => '76612432086bdcc15c6cca1f005cf763',
   './ModuleInstall/PackageManager/metadata/listviewdefs.php' => '642f76f5ce93ac4143f992a3e1097880',
   './ModuleInstall/PackageManager/PackageController.php' => 'af8c746cbb6ba5142568d34e535d0a94',
@@ -2900,7 +2902,7 @@ $md5_string = array (
   './Zend/Oauth/Signature/SignatureAbstract.php' => 'd44f7c92c85ba7915a6774e78f426b1c',
   './Zend/Oauth/Config/ConfigInterface.php' => '6830164ea9812294fc750da1337098f5',
   './Zend/Oauth/Config.php' => '80ff096d8cec0c5bb7d1388a480c8803',
-  './Zend/Oauth/Provider.php' => 'ec63fc45bc93092789954135a5024ceb',
+  './Zend/Oauth/Provider.php' => '73f517e54fb85ae62dd524342adb9a04',
   './Zend/Oauth.php' => 'a194292fb9c2439c2909d2b0fe17a2bd',
   './Zend/Gdata/Spreadsheets.php' => 'd6987183f1b327ccc11c9613fef7e474',
   './Zend/Gdata/MimeBodyString.php' => '8cc543fe62bfee59fd60edfa1755f1de',
@@ -3281,21 +3283,21 @@ $md5_string = array (
   './Zend/Loader.php' => '3a440481f38852f58a39b712ca87d1f9',
   './Zend/Registry.php' => '56b05bc37aa19203e114fe93782b33b0',
   './Zend/Crypt.php' => '0e72fd104506094fd2c7682b0b924542',
-  './json_server.php' => 'e08a0f156722169ffde6052329116ec2',
+  './json_server.php' => '04bdab8fb6160b89d42c2138429815f6',
   './SugarSecurity.php' => 'e87f1efee51af1d8801dc2376068cee3',
   './export.php' => '7639b2373c4d0c73765033d70abfb55d',
-  './data/BeanFactory.php' => 'b48ced42ffd6cc74d6bc14f334511919',
-  './data/SugarBean.php' => '957fc06d7d58dd604b8fc47c1af05807',
+  './data/BeanFactory.php' => '5148eb779611ca40e342900456fc6f29',
+  './data/SugarBean.php' => 'beb5df6b33dd3bb220b70f4bb562b6ec',
   './data/Link.php' => 'de95f31cf30c2f46a234c4a840c01f84',
   './data/Relationships/One2OneRelationship.php' => 'f72bfcb39e5c6c6092c41e148f464abf',
-  './data/Relationships/EmailAddressRelationship.php' => '00e8f2e17d2b8510c4489bbaa3b1bf52',
-  './data/Relationships/M2MRelationship.php' => '94ebf825a8fa96d17afc6d4256aa42ba',
+  './data/Relationships/EmailAddressRelationship.php' => '469a91798fa6a92e91766867b145a628',
+  './data/Relationships/M2MRelationship.php' => '048619c6fdf80ac7033447c911bb157b',
   './data/Relationships/RelationshipFactory.php' => 'd1b759cda7b9dc92f1032ed1be661816',
-  './data/Relationships/One2MBeanRelationship.php' => '4fa99959178eea2d1c7b47cd06c91c3d',
+  './data/Relationships/One2MBeanRelationship.php' => '26dea6117861b0d47c0c7f1f6b6f28c1',
   './data/Relationships/One2OneBeanRelationship.php' => 'ec639e887d2ff4bb0d16725b2a33b9ac',
-  './data/Relationships/SugarRelationship.php' => 'cbe9925dbe4be27852b85ddb329b8c2f',
-  './data/Relationships/One2MRelationship.php' => 'b4a2b82ab99fb5903df4d52f4173cb4a',
-  './data/Link2.php' => '9a423dd110cacdb3b6b9662b62403e2c',
+  './data/Relationships/SugarRelationship.php' => '7ecdecd5a7623b1f5a251286ffa48893',
+  './data/Relationships/One2MRelationship.php' => '9b90a0634f9c68460f6524069d0f60eb',
+  './data/Link2.php' => '08607d058075f66208b31b82037563b3',
   './data/Tracker.php' => '78c6ca1fadfe9e7984b001fed296f332',
   './service/core/SugarRestUtils.php' => '183a0d813c88928451133af63934b686',
   './service/core/webservice.php' => '7f6d3c42e37ee818424a35bb86f996a4',
@@ -3303,7 +3305,7 @@ $md5_string = array (
   './service/core/SugarSoapService.php' => 'f4f422721d9e907b35251978d1607093',
   './service/core/SugarRestServiceImpl.php' => 'd1a216a0907104a536ac894155f42136',
   './service/core/WSDL.tpl' => 'd41d8cd98f00b204e9800998ecf8427e',
-  './service/core/SugarWebServiceImpl.php' => 'd4e1e3d90da1e958d0223541d3210746',
+  './service/core/SugarWebServiceImpl.php' => 'bdc0e19d2da95de1637ce71b75b987c8',
   './service/core/SoapHelperWebService.php' => 'a132b424e253b1fe8c049545cc772465',
   './service/core/SugarWebService.php' => '57d68047756a2241b46ddc7bbc7db539',
   './service/core/PHP5Soap.php' => 'bec53408906a366dd024abff4ef6d5f2',
@@ -3313,7 +3315,7 @@ $md5_string = array (
   './service/core/REST/SugarRestJSON.php' => '34ac0a137d6d32f8b118625eae5d200b',
   './service/core/NusoapSoap.php' => 'd873f436aa7e135ff4203539057a8f4b',
   './service/example/test.html' => 'f6f19ffcb74c752eac7f2a33965b921c',
-  './service/example/example.html' => '20cb5472711ffbaf46271b80697fbbde',
+  './service/example/example.html' => '578f1f2037f074e2149b7b713eb2d2dc',
   './service/example/Rest_Proxy.php' => '1e238c0607c1c1a53e15a8b6ab875b1f',
   './service/utils/SugarRest.js' => '5921545770f1b97465e4a4bd3d723045',
   './service/v2_1/soap.php' => '4eb3b62f619732bd297652c1ab43fc4f',
@@ -3342,21 +3344,21 @@ $md5_string = array (
   './service/v4/soap.php' => '846a967557552767c6ae0d366d4d3d2e',
   './service/v4/registry.php' => 'eb5f47fb4e4a536aad58984a433b41d5',
   './service/v4/rest.php' => '0721bd365d3151c72db6f95ce4b7e186',
-  './service/v4/SugarWebServiceImplv4.php' => 'e6ff7126a7de746241ad61d0a44e1d9a',
+  './service/v4/SugarWebServiceImplv4.php' => 'ed700353ab607dd4ef970892b4b70971',
   './service/v4/SugarWebServiceUtilv4.php' => 'd7751060998c6e708a794e339a2152e9',
   './custom/index.html' => '601a18f179c2ac55779c9bac46942525',
   './modules/EmailTemplates/EmailTemplate.js' => 'c8ab748acfbda3ad0c5d8f6aa17f267b',
-  './modules/EmailTemplates/EmailTemplate.php' => '95f6cdf408b0032d4dee1b8e2a11e73b',
+  './modules/EmailTemplates/EmailTemplate.php' => 'f649e9e4e3b1775ed5a68dbb16219b11',
   './modules/EmailTemplates/Save.php' => '307b6446f617d164735636906d4971de',
-  './modules/EmailTemplates/PopupDocumentsCampaignTemplate.html' => '0eddd22d43ccb81b6d0c5178e595e2b6',
-  './modules/EmailTemplates/AttachFiles.php' => '360fc72276f89fbac4cf1380a0e9c8c7',
+  './modules/EmailTemplates/PopupDocumentsCampaignTemplate.html' => '8db4aacafa0252d4cc7cecc08eae3dd1',
+  './modules/EmailTemplates/AttachFiles.php' => '3c4b8a3c10bd740599100d3be76ac927',
   './modules/EmailTemplates/Menu.php' => '12c60c01cff38eef80ef1f74ac15bda8',
   './modules/EmailTemplates/vardefs.php' => '5a2782cf4173986482aa548ede86fe7b',
-  './modules/EmailTemplates/EmailTemplateFormBase.php' => '16cb8049789667d8278043324d51a6de',
+  './modules/EmailTemplates/EmailTemplateFormBase.php' => '633397ffa82b0b069e2b4eaf4ed6ef60',
   './modules/EmailTemplates/DetailView.html' => '84e76c36af3b463ebf114d1147cb3181',
   './modules/EmailTemplates/EditView.php' => '6a1efc7c34c9dff06241fa2381f49b5d',
   './modules/EmailTemplates/field_arrays.php' => '9b66e4d674a4d5ff2d1b4ff084595bda',
-  './modules/EmailTemplates/PopupDocumentsCampaignTemplate.php' => '8202422bc30f5c020bf53b1e2f208bba',
+  './modules/EmailTemplates/PopupDocumentsCampaignTemplate.php' => '08cbcc37e4e533f5292adb6e561b0688',
   './modules/EmailTemplates/DetailView.php' => '9bcbd6eb867eb7daa8c359b1995c0c77',
   './modules/EmailTemplates/Delete.php' => '686b937b8bdb44dce99b471ff60287a1',
   './modules/EmailTemplates/metadata/searchdefs.php' => '532d41036a1e05819f1c7c30d177583b',
@@ -3370,20 +3372,20 @@ $md5_string = array (
   './modules/Leads/LeadsQuickCreate.php' => '22025cf0899bc6ff093e5406a83fb2f7',
   './modules/Leads/Capture.php' => '8345afcd9e0aaa04101a74329b0360f7',
   './modules/Leads/Save.php' => '7a4c01eb0290f41237426b2059a85114',
-  './modules/Leads/tpls/ConvertLead.tpl' => 'bfbaa29b3a3513c81a15bf1f6d8a0b37',
-  './modules/Leads/tpls/ConvertLeadHeader.tpl' => '72696f4542311ce36c8e75506cc5bc62',
+  './modules/Leads/tpls/ConvertLead.tpl' => 'b545b499629ae94f250a664725bbd3fd',
+  './modules/Leads/tpls/ConvertLeadHeader.tpl' => '1f863d5d7fb31492d3dc8c14df4bdbc2',
   './modules/Leads/tpls/EditConvertLead.tpl' => '1546ed54811c02bf8deb822160cc7ac3',
-  './modules/Leads/tpls/QuickCreate.tpl' => 'f49c00a1acb4d5da111b509d6fde53ec',
+  './modules/Leads/tpls/QuickCreate.tpl' => '7a20b8143b5328b4380553c6f8ecc25d',
   './modules/Leads/tpls/ShowDuplicates.tpl' => '085379f8906ab42bafebe5470ac83f6c',
   './modules/Leads/tpls/DetailViewHeader.tpl' => 'e0b101be788e4d8244d1943d54e51cf8',
-  './modules/Leads/tpls/ConvertLeadFooter.tpl' => 'bf3afd30fc1f3be1d3eff4d96c05ca5c',
+  './modules/Leads/tpls/ConvertLeadFooter.tpl' => 'b0f1a9fd5d92f7e29b28cd8c58289911',
   './modules/Leads/Menu.php' => 'e41cf004f788a5488e8e035cafa00f4e',
-  './modules/Leads/vardefs.php' => 'c0b9c7fac9863100d49ee3938c0fd443',
+  './modules/Leads/vardefs.php' => 'f016e7d19cd1c6ffb36fbb808dad8574',
   './modules/Leads/views/view.showduplicates.php' => 'c9eac311e3979edb0a67b62beae4d46e',
   './modules/Leads/views/view.list.php' => '47e14d2db5e9b71d410c74ef07142f53',
   './modules/Leads/views/view.edit.php' => '4208b82205cf63936b78da5eac7df01f',
   './modules/Leads/views/view.detail.php' => 'a9442c60e714251976831e4f045c1808',
-  './modules/Leads/views/view.convertlead.php' => '4ce712de8614bfb84d4c0d9156435356',
+  './modules/Leads/views/view.convertlead.php' => '7f599cc8b88be9e6242798979df720b2',
   './modules/Leads/controller.php' => 'a60222b4af972a0171cf83640ea35103',
   './modules/Leads/field_arrays.php' => 'cdb8bd3732b0e84e9d1efe50e77e1ff4',
   './modules/Leads/Lead.php' => '77b1e1c182ce6b63c01147735ea44949',
@@ -3488,7 +3490,7 @@ $md5_string = array (
   './modules/Cases/Dashlets/MyCasesDashlet/MyCasesDashlet.php' => '6681a60a934612ae489592f2fd976d11',
   './modules/Cases/Dashlets/MyCasesDashlet/MyCasesDashlet.data.php' => '78590a9ee41fffceb0b06f1a05d711e4',
   './modules/Cases/language/en_us.lang.php' => '0130e84c1b1b56106feadeac5847e1ff',
-  './modules/Cases/Case.php' => '861df4f7a833be8214429234b4b48a25',
+  './modules/Cases/Case.php' => '2cb2cf7d9559c484dc319f923496c49f',
   './modules/Cases/SugarFeeds/CaseFeed.php' => 'f28ac1cf2e358afa0981b2c50d699669',
   './modules/Documents/documents.js' => '711c1c3534c03089c931006ba71abbaa',
   './modules/Documents/GetLatestRevision.php' => '4810e123a8d2793523ba6010bcf3a55f',
@@ -3560,7 +3562,7 @@ $md5_string = array (
   './modules/DynamicFields/templates/Fields/Forms/multienum.php' => 'd471de114fb79726b3d927af5e183bef',
   './modules/DynamicFields/templates/Fields/Forms/enum2.php' => '26d0b3e1e3007f449aad86a3cad90242',
   './modules/DynamicFields/templates/Fields/Forms/currency.tpl' => '868f091c06111638de58d21250367a38',
-  './modules/DynamicFields/templates/Fields/Forms/enum.tpl' => '37c3ff53204e62db9353cdf2edc4040d',
+  './modules/DynamicFields/templates/Fields/Forms/enum.tpl' => 'c499a424497552159bede58e4d454d71',
   './modules/DynamicFields/templates/Fields/Forms/text.tpl' => '10b5d55cf926dbc94cdc19b435303687',
   './modules/DynamicFields/templates/Fields/Forms/multienum.tpl' => '115b22f031c2d14b8f73c57b4f0626c4',
   './modules/DynamicFields/templates/Fields/Forms/encrypt.php' => '7d04775a0e24215cc96613263332f9b9',
@@ -3586,7 +3588,7 @@ $md5_string = array (
   './modules/DynamicFields/templates/Fields/TemplateRadioEnum.php' => 'fd593ace4380d03f814902ef3c72acc0',
   './modules/DynamicFields/templates/Fields/TemplateURL.php' => '42ad0725334368ae17b70d6bb77be92e',
   './modules/DynamicFields/templates/Fields/TemplateId.php' => '1e60856dfe5c3b955d0ffb04337b7b8f',
-  './modules/DynamicFields/templates/Fields/TemplateField.php' => 'd88e9679aed001ee7e0edb13f3448de0',
+  './modules/DynamicFields/templates/Fields/TemplateField.php' => '554a321a19ab27f46dcc8d3380e27272',
   './modules/DynamicFields/templates/Fields/TemplateCurrency.php' => 'ea510b1868f5dc211521653c976f4b1e',
   './modules/DynamicFields/templates/Files/EditView.php' => '8f438261aedc77e16c79c1cae4d3a9ac',
   './modules/DynamicFields/templates/Files/DetailView.php' => '6761c1d44ae1c7931778addfec404c4e',
@@ -3597,7 +3599,7 @@ $md5_string = array (
   './modules/Charts/DynamicAction.php' => '92cb8f5f38f39e2f0941e540538a7f1c',
   './modules/Charts/PredefinedChart.php' => 'c6e0e66e219b06d5cec5a660689f54ad',
   './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageConfigure.tpl' => 'c934826b8c835eb5872c50ea73f0a860',
-  './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php' => '70d0d2e0b1109c522a672b462d724c69',
+  './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php' => '0f3989e3bc545d0427cd94eb3f553173',
   './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.data.php' => '318982f0dac129039bb75ef6e4e8a028',
   './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.en_us.lang.php' => '06447f7fe8e70d3d7966eabca0b90692',
   './modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.meta.php' => '915e80e5016f6fb930e62a39bbe6db32',
@@ -3635,8 +3637,8 @@ $md5_string = array (
   './modules/Charts/code/Chart_my_pipeline_by_sales_stage.php' => 'b113bc62d9939b9c88de397e0dbf4281',
   './modules/Charts/code/Chart_pipeline_by_sales_stage.php' => '1206aa03a657c8742077b049c6cffec9',
   './modules/Charts/code/Chart_pipeline_by_lead_source.php' => 'ba05404a1f840ff230b153b35b912c23',
-  './modules/Calendar/Cal.js' => 'd3dd43dfb0406736473644b92d1b2c34',
-  './modules/Calendar/CalendarGrid.php' => '50296d0fbfef40dc7bb89af6c45395f2',
+  './modules/Calendar/Cal.js' => 'f3f00cbef5407be1ce27a7ba6f033b99',
+  './modules/Calendar/CalendarGrid.php' => '68c7e798f08e112dee5a8f3542ad8368',
   './modules/Calendar/Cal.css' => '1ed34bc3e3f614b7e9e5a18b373512dd',
   './modules/Calendar/tpls/footer.tpl' => '8587ef6903693da23a0ad7d27755c553',
   './modules/Calendar/tpls/repeat.tpl' => 'a522ad903cfad55945eff151fb0e223b',
@@ -3700,7 +3702,7 @@ $md5_string = array (
   './modules/Emails/MassDelete.php' => 'de2897f4e36f3c288b7afb9035a33abc',
   './modules/Emails/SearchFormMyInbox.html' => '8487a40c120546ed57546d86fbdc8aba',
   './modules/Emails/PopupDocuments.php' => 'b99f58a5b000491bad4783f45b744ed2',
-  './modules/Emails/EmailUI.php' => '8c390dbbb58f7434c51a835fcd0d0be0',
+  './modules/Emails/EmailUI.php' => 'bf9d7d8e7db8e0cb6ed638eb5c42ca8c',
   './modules/Emails/Status.php' => '8fac7135044f4315e917a5eb2d4d8ce3',
   './modules/Emails/Save.php' => '3c0ea8c00c5422e321632a64beb6af93',
   './modules/Emails/ListViewHome.html' => 'fbb035479e1194d9ac96039ade4b80f5',
@@ -3760,8 +3762,8 @@ $md5_string = array (
   './modules/Emails/templates/addressBook.tpl' => '11bc1077274903508285c15076486db2',
   './modules/Emails/DetailView.php' => '8714c1bdec2efa429cb4308cd5eee060',
   './modules/Emails/EmailUI.css' => '5b76c65f92c066ae2e5ba605f46843ee',
-  './modules/Emails/Delete.php' => 'b23cea6a0c9d74518acc12eb165a66e4',
-  './modules/Emails/EmailUIAjax.php' => 'c33aefabf1912990e39e3eaf7e2ab2fc',
+  './modules/Emails/Delete.php' => 'affa6e0b0571fa7e8bf357a8c76c6cdd',
+  './modules/Emails/EmailUIAjax.php' => '9c717f88fce7f95e8df54d979d71cd95',
   './modules/Emails/DetailViewSent.html' => 'cb8650d0dbffb23228464164f5eebc05',
   './modules/Emails/SubPanelViewRecipients.php' => '96eeda5a94b8bed623da3de94729cfde',
   './modules/Emails/metadata/subpaneldefs.php' => '5abf35c671952bc53247c669fe9425fe',
@@ -3775,19 +3777,19 @@ $md5_string = array (
   './modules/Emails/metadata/additionalDetails.php' => 'd6245f09b4988484416ffea3ee28118d',
   './modules/Emails/Check.php' => 'e955c7c45b1d2488cc57ada923142575',
   './modules/Emails/SugarRoutingAsync.php' => '0a9ca1ac80b9c759693c1b2e9cbda26d',
-  './modules/Emails/javascript/composeEmailTemplate.js' => '40158862759b06078af3f54cedf9ce67',
+  './modules/Emails/javascript/composeEmailTemplate.js' => '0701570fcd6d72e8e51d3bbc4e10336d',
   './modules/Emails/javascript/Email.js' => '7a8528f141f6de141336426c497dfbcd',
   './modules/Emails/javascript/email_popup_helper.js' => '104dd8dd391a907e53606df613d90f34',
   './modules/Emails/javascript/init.js' => 'b48256570c9c73556b36248fd7b45d8b',
   './modules/Emails/javascript/displayOneEmailTemplate.js' => '4efbf9ed736dffca56a40d16456adf58',
   './modules/Emails/javascript/ajax.js' => '8f5fe6bceb18a5f88c98dea09eacffcd',
-  './modules/Emails/javascript/EmailUICompose.js' => 'bcf0730642ff16dddb391086929a7283',
-  './modules/Emails/javascript/EmailUI.js' => '8310a610f8cc27425f02a1adf7bbccc5',
+  './modules/Emails/javascript/EmailUICompose.js' => '70b4108c9e5591a5c6132f36228cb5d9',
+  './modules/Emails/javascript/EmailUI.js' => '8a62cd712eb4f7c5fac2713f00a160d6',
   './modules/Emails/javascript/grid.js' => '3f466dcfd19ed70d90ff386eb40ff28d',
   './modules/Emails/javascript/viewPrintable.js' => '1e5ed81de106298be2e5c11f955c6a09',
   './modules/Emails/javascript/vars.js' => '94c74e526e26aa91ab32bcd01cd4a70b',
   './modules/Emails/javascript/EmailUIShared.js' => '7f22615880460f916042d37a166121b5',
-  './modules/Emails/javascript/complexLayout.js' => '88f11d9d2b2054b854a5f2902cf55f51',
+  './modules/Emails/javascript/complexLayout.js' => '209c1708bc8206dba6d393a8e6d5a2fe',
   './modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.data.php' => '0feed910c9a96a7dc40b92fab7cdecf7',
   './modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.meta.php' => '78e3080b36e3fc91059ec1a4c00e6fa2',
   './modules/Emails/Dashlets/MyEmailsDashlet/MyEmailsDashlet.php' => '800c73f841d60c1dcddf8f9efe1ce481',
@@ -3801,7 +3803,7 @@ $md5_string = array (
   './modules/Emails/PessimisticLock.php' => 'eec9f812607afdf9681c668939cf1794',
   './modules/Emails/language/en_us.lang.php' => '694b3c5daffb0a1d311a6c12efdbb0b8',
   './modules/Emails/ListViewMyInbox.html' => '80a65ca00efffeda3eed9767b4dc5164',
-  './modules/Emails/Email.php' => '4944609c0f57cd81fb4bc0ab6bc76d44',
+  './modules/Emails/Email.php' => 'f0fadd2a69b36cff199f97101168b772',
   './modules/Emails/subpanels/ForQueues.php' => '627f6382bc5961151c8ff23c44e3dae7',
   './modules/Emails/subpanels/ForHistory.php' => '7b08fa447e4f5623997e1b9fa1016389',
   './modules/Emails/subpanels/ForContacts.php' => '1e6eec75a19bfe36e1fbb9a47fa56d76',
@@ -3814,13 +3816,13 @@ $md5_string = array (
   './modules/Help/language/en_us.lang.php' => '5d812d2e4d54e4d42a183759d37a08d5',
   './modules/Configurator/tpls/addFontView.tpl' => 'e9648c46d6531dd171be401321a65209',
   './modules/Configurator/tpls/SugarpdfSettings.tpl' => '531e1a326d57e6fc4ad8d13c2396725e',
-  './modules/Configurator/tpls/adminwizard.tpl' => '3395344a071fd33ef91b462b72df9592',
+  './modules/Configurator/tpls/adminwizard.tpl' => 'e7e09002098922f095c198018d8751f8',
   './modules/Configurator/tpls/fontmanager.tpl' => '1825567230ccefbe24318f6e87fd18a8',
-  './modules/Configurator/tpls/EditView.tpl' => '1000eae4bb61eba91663b51e10a4513e',
+  './modules/Configurator/tpls/EditView.tpl' => '5783783b2a2ef3c8d60fb764fe2e9158',
   './modules/Configurator/tpls/SugarpdfSettingsFields.tpl' => '220de2fecf8bd16f2a6bde807a3d1196',
   './modules/Configurator/tpls/addFontResult.tpl' => '883aab2f2c47f7dd78d69d8094257a79',
   './modules/Configurator/Menu.php' => '5cbc243dd9e97433e65b6c2c97a5249b',
-  './modules/Configurator/Configurator.php' => 'd17b1716ce0e2007f0c17ad3681bc04d',
+  './modules/Configurator/Configurator.php' => '937f8bf118148f0a849a6af3929bfba3',
   './modules/Configurator/views/view.sugarpdfsettings.php' => 'c103556cc9abd3acaa666fb9787e1aee',
   './modules/Configurator/views/view.addfontresult.php' => '2e92eedd9ae52db5903bb11d5286b77b',
   './modules/Configurator/views/view.addfontview.php' => '4219a23aa0e9d936b847dc353aa1bd2b',
@@ -3829,13 +3831,13 @@ $md5_string = array (
   './modules/Configurator/views/view.fontmanager.php' => 'ce7094f56148716bbf592e6ee39c5c79',
   './modules/Configurator/controller.php' => 'b0a13efcd7259e5228b0e4e5153aa69c',
   './modules/Configurator/UploadFileCheck.php' => '334b4fecc6d48d8e25d9d352546846fc',
-  './modules/Configurator/LogView.php' => 'f36febb03ff544126ae335a35fe23923',
+  './modules/Configurator/LogView.php' => '765205bf61f4ccf357703f41fec2c61b',
   './modules/Configurator/metadata/SugarpdfSettingsdefs.php' => '11e35d8657b2f5fa72588ec9fab24f54',
   './modules/Configurator/action_view_map.php' => '335f3982fdb42f04ed981f930a82c733',
-  './modules/Configurator/language/en_us.lang.php' => '43cd49c8648e7100336937699d013d2e',
-  './modules/Configurator/Forms.php' => '05095502bdc7e8e5ef2c726d45356a13',
+  './modules/Configurator/language/en_us.lang.php' => '8ced23a587b14a9e951f5c8797584dc9',
+  './modules/Configurator/Forms.php' => 'ce7ede2f412813db12e761d60c2eeff1',
   './modules/Schedulers/Schedulers.js' => 'ce310f70ad5579397f7af6609a4d6601',
-  './modules/Schedulers/_AddJobsHere.php' => '1f2f9a09fc574098bc384586589c9729',
+  './modules/Schedulers/_AddJobsHere.php' => 'ecc086b6d6534b64759e7ac83ea01bc2',
   './modules/Schedulers/Save.php' => 'c226203aa66f5352e9f8369558ccfba0',
   './modules/Schedulers/Menu.php' => 'ec8fe31293309109bc89184d9e59d4d1',
   './modules/Schedulers/vardefs.php' => '8e502b914fdbb030d4bac26392a2bd85',
@@ -3845,7 +3847,7 @@ $md5_string = array (
   './modules/Schedulers/EditView.php' => '17e7ea9a33c92765aafd7504f80d0e3e',
   './modules/Schedulers/field_arrays.php' => 'cc96b2df3fc8573b600f1595c1572a5b',
   './modules/Schedulers/SchedulerDaemon.php' => 'f750c573f651acf60b319275b980b803',
-  './modules/Schedulers/Scheduler.php' => 'cba11a89db736a4a39fac4bbf56f2716',
+  './modules/Schedulers/Scheduler.php' => '5d37648db5f6b3a934e510ffadc8ddc2',
   './modules/Schedulers/metadata/searchdefs.php' => 'a75affb2a436476c4b544f41ef5e5f3f',
   './modules/Schedulers/metadata/subpaneldefs.php' => '0c954d9ff9fa9cfeb0ee98437d49b9a0',
   './modules/Schedulers/metadata/editviewdefs.php' => '4f01fea0e76c37ca96e557ec57876898',
@@ -3854,7 +3856,7 @@ $md5_string = array (
   './modules/Schedulers/metadata/listviewdefs.php' => '82d75c31c116f31c3efd862671643a81',
   './modules/Schedulers/metadata/detailviewdefs.php' => 'be5fd6bc342e6a40cbdcda2bdf2b29e2',
   './modules/Schedulers/JobThread.php' => '372301a6c760a85b3d69ddce4f027a32',
-  './modules/Schedulers/language/en_us.lang.php' => 'c743fe536205090bb1efbe67de987549',
+  './modules/Schedulers/language/en_us.lang.php' => '5cb1327c9bd54f24a1f691e1686be928',
   './modules/Schedulers/EditView.html' => 'a41e1080ad5e758cead6f4aef669292b',
   './modules/OAuthTokens/vardefs.php' => '100e655f0e3b7022852367fa89ec32e1',
   './modules/OAuthTokens/views/view.authorize.php' => 'f8a69d966c7d3edd9b82e1cc408626f0',
@@ -3874,7 +3876,7 @@ $md5_string = array (
   './modules/EAPM/EAPM.php' => '6f19c27f167b845d17f666b75c78d50d',
   './modules/EAPM/views/view.edit.php' => 'afc6bf56ff7efea435fe599bf60914ab',
   './modules/EAPM/views/view.detail.php' => 'd2bd942b71ed9cdcb464728922f0f089',
-  './modules/EAPM/controller.php' => '5f1d75be038cfcbd23deeed9f000c080',
+  './modules/EAPM/controller.php' => 'aa4139beab6c8c74c2ffa752aecfd468',
   './modules/EAPM/metadata/searchdefs.php' => '252e61c70aff8266724feb3e9c0ce6bc',
   './modules/EAPM/metadata/metafiles.php' => '22f0924cf0ae9348853b8bd689270644',
   './modules/EAPM/metadata/quickcreatedefs.php' => 'b657356c48f246d874850e30fb841d6a',
@@ -3895,13 +3897,13 @@ $md5_string = array (
   './modules/InboundEmail/vardefs.php' => '9165aa71623a179d41cf5d9b85145ff1',
   './modules/InboundEmail/View.html' => 'bc8a276ffbe71fa4763a040ae6c5daad',
   './modules/InboundEmail/DetailView.html' => 'dd0bafd353b564debffaeb59f98f512f',
-  './modules/InboundEmail/EditView.php' => '8d2777b9b2a0f72f198858073abb6e37',
+  './modules/InboundEmail/EditView.php' => 'c6921bb98de78481ba55b4164d5255ba',
   './modules/InboundEmail/ListView.php' => '69f5836cee3be0e4afcd740d795ca44e',
   './modules/InboundEmail/field_arrays.php' => '80b0dde460bc6d96c9d2d9af9d73aaff',
   './modules/InboundEmail/DetailView.php' => 'a171268c4c9e85ac2fc62efce30deeb7',
   './modules/InboundEmail/Delete.php' => 'b49ee65d8850ff8ff370ebf237b0acb5',
   './modules/InboundEmail/Popup.php' => '472052c2da7990c6e8d63a0a2dccbbd2',
-  './modules/InboundEmail/InboundEmail.php' => '177f5e895c49d65f2eee974ed9a01343',
+  './modules/InboundEmail/InboundEmail.php' => '4ed6b6cb6b0602abf3a6f2907774d78b',
   './modules/InboundEmail/ListView.html' => 'd76aa28386e3f7165f62dabfc6f0beb7',
   './modules/InboundEmail/index.php' => '6b54e0739c45bd059cc2da5f3aa41d9a',
   './modules/InboundEmail/language/en_us.lang.php' => 'ae833e99a3be579da67788c144af7ee2',
@@ -3914,7 +3916,7 @@ $md5_string = array (
   './modules/ModuleBuilder/tpls/includes.tpl' => '10927a4f55674bb2ab628a67dfa6c696',
   './modules/ModuleBuilder/tpls/index.tpl' => 'beaabb0f0f33d69a479dd08d3e7bbe04',
   './modules/ModuleBuilder/tpls/resetModule.tpl' => '2e110babe7eab76ecc92b94ca1cd18a9',
-  './modules/ModuleBuilder/tpls/editProperty.tpl' => '8e715c7c08eb3aa801690c9dc599c04f',
+  './modules/ModuleBuilder/tpls/editProperty.tpl' => '941fa1ea92551cb3b7535d49457134ae',
   './modules/ModuleBuilder/tpls/assistantJavascript.tpl' => 'b81f8d3ef511fbd137c65b840b5cccbf',
   './modules/ModuleBuilder/tpls/main.tpl' => 'e06f2e78d6ce29075de8d053d2d85818',
   './modules/ModuleBuilder/tpls/studioRelationship.tpl' => 'ec7c351c57a08d0a985d34106e7b4fba',
@@ -3964,7 +3966,7 @@ $md5_string = array (
   './modules/ModuleBuilder/parsers/views/GridLayoutMetaDataParser.php' => '9ba5877abde15af9017cb5357d2bb490',
   './modules/ModuleBuilder/parsers/views/PopupMetaDataParser.php' => '983372e3529c23ff91237434f7c3e9bb',
   './modules/ModuleBuilder/parsers/views/MetaDataImplementationInterface.php' => '96a4fcfa2ee73ff09cb2d868c3ac686f',
-  './modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php' => 'be0b37cb1b948cad5f982a40b6acff20',
+  './modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php' => '5135692589012551cd63d5efd43419e1',
   './modules/ModuleBuilder/parsers/views/History.php' => 'a564c9e3b8c97298cca20e70ddda1060',
   './modules/ModuleBuilder/parsers/views/DeployedMetaDataImplementation.php' => '42220536052241844c59285762872d6c',
   './modules/ModuleBuilder/parsers/views/ListLayoutMetaDataParser.php' => 'bb5f5c2be17774499559cb56b272b00c',
@@ -3981,14 +3983,14 @@ $md5_string = array (
   './modules/ModuleBuilder/parsers/constants.php' => '859d39d8e265b729077ef95e6f3dfb6e',
   './modules/ModuleBuilder/parsers/parser.modifysubpanel.php' => 'c3848b1a209455fe7f4a3a1fcbb53fe4',
   './modules/ModuleBuilder/parsers/ParserFactory.php' => 'ab9f0e24322d43c62a5e55411670cbd9',
-  './modules/ModuleBuilder/parsers/StandardField.php' => 'f3a1615425410df4b761d897f54a2ccc',
+  './modules/ModuleBuilder/parsers/StandardField.php' => '1c8dd4d86e92c298088b945884d971eb',
   './modules/ModuleBuilder/Module/StudioModuleFactory.php' => '5a0a2bd755bc8add80477aa029324416',
   './modules/ModuleBuilder/Module/MainTree.php' => '2817547b3c188df1d5c4b0bed2510552',
   './modules/ModuleBuilder/Module/StudioTree.php' => 'ba8cb5bb1828ab02c95b763ebb0d508f',
   './modules/ModuleBuilder/Module/StudioBrowser.php' => '92c13d7c173dd243c2a72c821c17189f',
   './modules/ModuleBuilder/Module/StudioModule.php' => '5b74fa0e37cab0c3268e1bf46545bf09',
   './modules/ModuleBuilder/Module/DropDownTree.php' => '1efd3171700422c9bb838a0e8a8c8699',
-  './modules/ModuleBuilder/Module/DropDownBrowser.php' => 'eb231cf94dbec3b0cf1bfa5bd14bb5d2',
+  './modules/ModuleBuilder/Module/DropDownBrowser.php' => '70c0cff3e4a7abee8a2a4bac01539837',
   './modules/ModuleBuilder/views/view.modulefield.php' => '0ddd7c1412185c73d3aa2428d7ca8ecb',
   './modules/ModuleBuilder/views/view.relationship.php' => '59e94a5659c958248c3b6353e19ad4d0',
   './modules/ModuleBuilder/views/view.history.php' => '300fe8425bd9b4758ed01d7796c295c1',
@@ -4009,7 +4011,7 @@ $md5_string = array (
   './modules/ModuleBuilder/views/view.home.php' => '720827d3c058a8a0326c2e20acefa892',
   './modules/ModuleBuilder/views/view.deletepackage.php' => 'a2d989f2d727d1b1daf6c3355bdd6834',
   './modules/ModuleBuilder/views/view.labels.php' => '92f65144037092997d893f6f27267c1c',
-  './modules/ModuleBuilder/views/view.modulefields.php' => 'd7b7ab0df5efb2a07f6bba000b59b599',
+  './modules/ModuleBuilder/views/view.modulefields.php' => 'db193a51a951252b44757c3b137bb001',
   './modules/ModuleBuilder/views/view.dropdown.php' => '3cbe9809445893bfcf303312ad1dbe47',
   './modules/ModuleBuilder/views/view.module.php' => '1d7dde7b00d30ab2869ab96ddf308f5b',
   './modules/ModuleBuilder/views/view.popupview.php' => '74c6596d0bc4653986aedc9ddfde779c',
@@ -4025,12 +4027,12 @@ $md5_string = array (
   './modules/ModuleBuilder/javascript/studiotabgroups.js' => '9122fbe637449b8419dcf54138796d61',
   './modules/ModuleBuilder/javascript/studio2ListDD.js' => '89470dcfe5c0f6db12a16eeefe3ed261',
   './modules/ModuleBuilder/javascript/studio2.js' => 'fd387f59c9ffe44be63fca80334739f6',
-  './modules/ModuleBuilder/javascript/SimpleList.js' => '8c992a1bb0eaac77df79c79bb5e8cec5',
+  './modules/ModuleBuilder/javascript/SimpleList.js' => '5fb0b6e7e22287db56a3b5cd4c56f183',
   './modules/ModuleBuilder/javascript/wizardTemplate.js' => '3d3ab9ff2f4bbf520c3d708c370919d9',
   './modules/ModuleBuilder/javascript/studio2PanelDD.js' => '5f88544d725e6f2f11fff83f65307043',
   './modules/ModuleBuilder/MB/header.php' => 'baaed55a6950279aa14ed24eb6007395',
   './modules/ModuleBuilder/MB/MBField.php' => '545003d5e4f70b3a80e360c27e287e6e',
-  './modules/ModuleBuilder/MB/MBModule.php' => '7073494aca895aab8749312c0e0b1dd6',
+  './modules/ModuleBuilder/MB/MBModule.php' => 'db62117969740eb4bf8418c7caca92d6',
   './modules/ModuleBuilder/MB/AjaxCompose.php' => '0cf04c16ff5531e9b354a21bb56fb17c',
   './modules/ModuleBuilder/MB/MBPackageTree.php' => '479f8be396033c768a3b82780d8420a9',
   './modules/ModuleBuilder/MB/MBPackage.php' => '8ac03a0316199829747b838aa595fab7',
@@ -4045,7 +4047,7 @@ $md5_string = array (
   './modules/ACL/Menu.php' => '8e2a919d4a5ef7be81da1d595c040756',
   './modules/ACL/vardefs.php' => '144b57d9ce06d3a8c4299cde7fef6f02',
   './modules/ACL/List.php' => '254276a7d36484bcc6d8f824c61db99e',
-  './modules/ACL/ACLController.php' => '03ebacc473e74b852651e65c04b621bc',
+  './modules/ACL/ACLController.php' => '1328407e0cb90d30ef3eb5788ecc133d',
   './modules/ACL/metadata/subpaneldefs.php' => 'c204dd72d0968e6e2abf09e939b25533',
   './modules/ACL/install_actions.php' => '998ffc32f565498f746326df9148071d',
   './modules/ACL/language/en_us.lang.php' => 'e2a65e4af8cc7bad1608a9199d35dbcf',
@@ -4094,7 +4096,7 @@ $md5_string = array (
   './modules/ProjectTask/Popup_picker.html' => '599aea3c4bb94c44bc6b571f85039da2',
   './modules/ProjectTask/language/en_us.lang.php' => '291c29163c08a0d60f7c200c998b57f2',
   './modules/ProjectTask/SubPanelView.html' => '8ad278482a2196fd3724678e93d5548a',
-  './modules/ProjectTask/ProjectTask.php' => '786e73ee32c56ccc06b6a9a065ada5b7',
+  './modules/ProjectTask/ProjectTask.php' => '572516f9f29b9bab9d37758c8ae6a74c',
   './modules/Roles/SubPanelViewUsers.php' => '0cf48b5aacb808c18215f1c5fb0e1599',
   './modules/Roles/Save.php' => '5a20f629f440ff956ddbbdb02912d39e',
   './modules/Roles/SaveUserRelationship.php' => '2b4aa98c3d0a281b3c3e0417c195a1af',
@@ -4147,7 +4149,7 @@ $md5_string = array (
   './modules/Tasks/Dashlets/MyTasksDashlet/MyTasksDashlet.meta.php' => '719d34858e77076907e79c48d35a621b',
   './modules/Tasks/Dashlets/MyTasksDashlet/MyTasksDashlet.php' => '33b8a83c6c1555983393b8f0918698e2',
   './modules/Tasks/language/en_us.lang.php' => 'b74f5f371636fec60f50199402160c3b',
-  './modules/Tasks/Task.php' => '8d708e18ecaf6d40e5fc147f77df6d01',
+  './modules/Tasks/Task.php' => '87b0ac5c07c05a726e5a5b585409386f',
   './modules/Opportunities/SubPanelViewProjects.html' => 'ee53a295ab36aa28c8907678365f84f1',
   './modules/Opportunities/Save.php' => 'c09e98757bed656984ff81482a5a6b30',
   './modules/Opportunities/tpls/QuickCreate.tpl' => '731c98d4b49e7a608da03ce0819a2204',
@@ -4225,9 +4227,9 @@ $md5_string = array (
   './modules/Versions/index.html' => 'af8417bd71dc406e87cc5068181d93d4',
   './modules/Versions/ExpectedVersions.php' => 'fd957e25b1f781c4bfcc2634982cb0fb',
   './modules/EmailMan/EmailManDelivery.php' => 'e8df08d36ff1722cb5e0e2f6932beadf',
-  './modules/EmailMan/tpls/config.tpl' => '26aa319210a50d101716978c4d0a7b26',
+  './modules/EmailMan/tpls/config.tpl' => '7e55d7fa49f3392f7ce2e221da9c8615',
   './modules/EmailMan/tpls/campaignconfig.tpl' => '48dfd3bdc7b02bf2790f5baa8cf74911',
-  './modules/EmailMan/EmailMan.php' => '60fa03ffd7439de8f49e0f30c0fdf486',
+  './modules/EmailMan/EmailMan.php' => '2ca8c32e6bdb94fa586c3a88e1cc5a47',
   './modules/EmailMan/Menu.php' => 'e42681e7ce08924a06d020bd27f291c4',
   './modules/EmailMan/vardefs.php' => 'bb0f414c73b28779fe531420052a811f',
   './modules/EmailMan/views/view.campaignconfig.php' => '164c8b6ebb8fcea03f37ae881a776329',
@@ -4250,11 +4252,11 @@ $md5_string = array (
   './modules/Users/PasswordRequirementBox.js' => '5501145e15a9b907efc9df667462d52b',
   './modules/Users/User.js' => 'f608f699e43355dbebcf6bf26a460a4e',
   './modules/Users/UserEditView.js' => '829b9bd128f07eeb48181aaee9ca6576',
-  './modules/Users/UserViewHelper.php' => '612fa61e0f32def4b632406331684c77',
+  './modules/Users/UserViewHelper.php' => '7e56be60efbe5ac4facf17adfa95707d',
   './modules/Users/Error.php' => 'e47d743efb522af6e4861396be53e8b6',
-  './modules/Users/Save.php' => 'f821b4fe1bc6daf587b65a2e9ae91dea',
+  './modules/Users/Save.php' => '4cd35037cbf01fae5b655fab371a4272',
   './modules/Users/tpls/DetailViewFooter.tpl' => '41360606a7be7665511d0a4edfb4924b',
-  './modules/Users/tpls/EditViewFooter.tpl' => '9a20a1237951d883c3446e8b9c91579c',
+  './modules/Users/tpls/EditViewFooter.tpl' => '381d83f79812fd28585583730fd7fd1f',
   './modules/Users/tpls/EditViewHeader.tpl' => 'a3db8cb89fe92f5d15ad18aee0587848',
   './modules/Users/tpls/wizard.tpl' => 'f8f87728585eb6f754f0d5ec52d640ff',
   './modules/Users/tpls/QuickEditFooter.tpl' => 'ca1415ac61ae726339e359a43a25d97e',
@@ -4266,21 +4268,21 @@ $md5_string = array (
   './modules/Users/PopupUsers.php' => '4014d4aec3ea2b4197dcddf8f0cb726d',
   './modules/Users/ListRoles.php' => '5aecfc211a0f4f9d08010a3f7ab4f334',
   './modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php' => 'd560e09d6f9611d7e27b33567adb2e51',
-  './modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php' => '1444f1d0db49d6485b836a4e948e5517',
+  './modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php' => '6bfbcf6f12037e86cf8d1272a7fc36a6',
   './modules/Users/authentication/EmailAuthenticate/EmailAuthenticate.php' => '508a6bb9096ea7007d3a17369bceb30b',
   './modules/Users/authentication/EmailAuthenticate/EmailAuthenticateUser.php' => 'ecfec41538756322697fc605da89acef',
-  './modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php' => '098392e5a27f6d837b82268037464f63',
-  './modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php' => 'f274a0cab35785d3ed960947b9d28caf',
-  './modules/Users/authentication/SAMLAuthenticate/settings.php' => 'aac61ea76cd0f3d13cdfcfc5e83d18b1',
+  './modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php' => '043a43bd937dbc3d3086b0cf5837232e',
+  './modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php' => 'e949e5ce5eedabe90cd4b26c84aacaf5',
+  './modules/Users/authentication/SAMLAuthenticate/settings.php' => '7a16d20c3805909e694d778715565f9b',
   './modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/CHANGELOG.txt' => '113d14ef4333039359236ffed624fb85',
-  './modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php' => '76623791faf895bcbbd016d9945e8c48',
+  './modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php' => '8b832c004e559e701915bb57b661dda7',
   './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php' => '881ac527f24c2cd34b2565dcca59834a',
   './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/settings.php' => 'bf420ca408bb2c25ee04d6d24651306c',
   './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/xmlsec.php' => '0804d079f7dd5b88a810d3b2f13b54a1',
   './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/authrequest.php' => '96705df3ae615cdb2c75b2ca6bed6d05',
   './modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php' => 'fe50684dde6449668ec090969855ed59',
-  './modules/Users/authentication/SAMLAuthenticate/index.php' => '9e608bd978f87faff418924de5f79864',
-  './modules/Users/authentication/AuthenticationController.php' => '150a043e0f98128449eca108e5846aa5',
+  './modules/Users/authentication/SAMLAuthenticate/index.php' => 'c576340598c48831d9f63bd10a650bf7',
+  './modules/Users/authentication/AuthenticationController.php' => 'c4bdbefbe4bbdcdf4f730847258250c9',
   './modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticateUser.php' => '8b6e2385733365bdfc7f3d282c7b79c3',
   './modules/Users/authentication/LDAPAuthenticate/LDAPConfigs/default.php' => 'ca2447e635257835058b49b06d2234a8',
   './modules/Users/authentication/LDAPAuthenticate/LDAPAuthenticate.php' => '772663335111c6ced3f8adffe3fd78c2',
@@ -4293,17 +4295,18 @@ $md5_string = array (
   './modules/Users/views/view.detail.php' => 'ea79f6d76e0b9ac1650a018fca3f857a',
   './modules/Users/controller.php' => 'ab707e79b219d0f9a9302b7549cf9d8e',
   './modules/Users/SaveSignature.php' => 'cc2276e326ce4a58a4fce9b147302c4f',
-  './modules/Users/User.php' => '04882b63dd164032b49c92be33b39588',
+  './modules/Users/User.php' => 'bff839e28f1a81ccbb04d2e86c2efc20',
   './modules/Users/login.tpl' => '7655c5b489de7a779cd7191d2ede3fa2',
+  './modules/Users/LoggedOut.tpl' => '56f709612a02e111d2411a771b11cd80',
   './modules/Users/SaveTimezone.php' => '3a27e5b03cbb1a9501401521dd2c1168',
-  './modules/Users/Login.php' => '7e1b037ae884636443058bf6e6ecb9ae',
+  './modules/Users/Login.php' => 'ff1d42fe242df34fcb1233e429c786e9',
   './modules/Users/PasswordRequirementBox.css' => 'cac9ef53c3926307cdb27bd4d960f837',
   './modules/Users/field_arrays.php' => 'dd10e757de20644a16a95c2e87bcecac',
   './modules/Users/UserSignatureEditView.html' => '583e97e48d516a55745369222600b215',
   './modules/Users/SetTimezone.php' => 'c44b79aaff575d0ca6250a1f1b7dcd84',
   './modules/Users/password_utils.php' => '81d971c14523bc6a3e494c5c0bf1933f',
   './modules/Users/SetTimezone.tpl' => '63de1550c8415a4a7f510846b0f1010a',
-  './modules/Users/GeneratePassword.php' => '0f5a2788a241f57996ab81b6c1e20b99',
+  './modules/Users/GeneratePassword.php' => '48bf5ad222ec34fb4df62baf30e134be',
   './modules/Users/ChangeGroupTab.php' => '6e1a3d401d7fd5f53bb79478ea6ab905',
   './modules/Users/metadata/searchdefs.php' => '8da9385b7be582391c6cd0ee32ec302f',
   './modules/Users/metadata/subpaneldefs.php' => '46b92950b7489723bc30fc5be7b2e680',
@@ -4327,12 +4330,13 @@ $md5_string = array (
   './modules/Users/UserSignature.php' => '410eac350e431f5f5e88ca59a01ad7d3',
   './modules/Users/Popup_picker.html' => '44ecf49fcfd43110437ff32d25736fa1',
   './modules/Users/Changenewpassword.php' => 'd957ddd60abddcc028f74079bc7e05ac',
-  './modules/Users/language/en_us.lang.php' => '116dc2ad31c655e05a3e349287e3c66c',
-  './modules/Users/Logout.php' => '9b9980898ec0a1d58eaaf8a00faa2e67',
+  './modules/Users/language/en_us.lang.php' => '4bb673fcd8bc1a00b98bbe7cd2a476a2',
+  './modules/Users/Logout.php' => '4d8773fffd6b85b1f39a61e05faf472f',
   './modules/Users/Popup_Users_picker.html' => '72ca55f89e936ccf6c8b1f252ee54236',
   './modules/Users/Changenewpassword.tpl' => '8d01c6786232a13cb1ced470885ca4b5',
+  './modules/Users/LoggedOut.php' => '018a075d940ac9717adb71772c18c66a',
   './modules/Users/Forms.php' => '5bc2ea470a1b882fa2bd7c199050353f',
-  './modules/Users/Authenticate.php' => '609ae7f1212586839801101fed57ee78',
+  './modules/Users/Authenticate.php' => '8cac4704de6bc4587619a6681c00bbce',
   './modules/Users/PopupSignature.php' => '0d985743e8edf9ac971a4429b5c2234a',
   './modules/MergeRecords/Merge.js' => '97010cd73430a547b52fd78bf43e39e8',
   './modules/MergeRecords/Menu.php' => '299299650e5eae06f5daf4e4a01c0bed',
@@ -4342,16 +4346,16 @@ $md5_string = array (
   './modules/MergeRecords/MergeRecord.php' => 'a1e14dd55abc1acba8057459cc4e420a',
   './modules/MergeRecords/SaveMerge.php' => '802a904c4ea6fd350d08bb0d07351294',
   './modules/MergeRecords/SearchForm.html' => '8fa7f9764d62894b46001683041bd624',
-  './modules/MergeRecords/Step1.html' => '65e2354905d25c09ef85ec96fb24da12',
+  './modules/MergeRecords/Step1.html' => 'cfa273cd3a93429bf9a9c85b30c6b9e9',
   './modules/MergeRecords/controller.php' => '71cf23ac9c1c52c4f6cac69a983240bb',
   './modules/MergeRecords/MergeField.html' => '725317ff7cfafbb61d5e0ece31639d3d',
   './modules/MergeRecords/Step2.html' => '3c434acb90ffdfc501f0fd9364e0360e',
-  './modules/MergeRecords/Step3.html' => 'a006f6204417cb30b4682efcc52ad270',
-  './modules/MergeRecords/Step2.php' => '3f5656e8c3c03dd1c92738bd42f57958',
+  './modules/MergeRecords/Step3.html' => 'f02ad4b4cee3d54a9acc059ece9bd45e',
+  './modules/MergeRecords/Step2.php' => 'a54b39114a53cde7cc2a7fc9da7ba922',
   './modules/MergeRecords/index.php' => 'aace848c26506ff9f2734185d902b05c',
   './modules/MergeRecords/language/en_us.lang.php' => 'f3bbb4d00c017d7c9a6f6b098ac83c0a',
   './modules/SugarFeed/AdminSettings.php' => '6dc3e601c6f06f30e86b07a4112b6d93',
-  './modules/SugarFeed/tpls/AdminSettings.tpl' => 'c49be19fcf55188a424ef1eef95fedaa',
+  './modules/SugarFeed/tpls/AdminSettings.tpl' => 'c3176e0e283a338de7fabe4281d3dfdb',
   './modules/SugarFeed/linkHandlers/Link.php' => '3d59c8d1e915ec4bce6635fdfe16dc9a',
   './modules/SugarFeed/linkHandlers/YouTube.php' => '371fda22ea597693dfec7c67b0643eb8',
   './modules/SugarFeed/linkHandlers/Image.php' => 'e191bdb76f7ec7d8862e0c43b7175eca',
@@ -4406,7 +4410,7 @@ $md5_string = array (
   './modules/UpgradeWizard/SILENTUPGRADE.txt' => '8bc2c883f98135447095081ef933a04e',
   './modules/UpgradeWizard/populateColumns.php' => 'e9a77b423f33e94e6c2e8664293e2a4b',
   './modules/UpgradeWizard/preflight.php' => 'f54a095ddbbf38c82e613992573e30d0',
-  './modules/UpgradeWizard/silentUpgrade_dce_step1.php' => '01034a404987e9346cb988ff2ebdacd5',
+  './modules/UpgradeWizard/silentUpgrade_dce_step1.php' => 'e0c3c8dc26626e9e633b5072dd5c854d',
   './modules/UpgradeWizard/tpls/layoutsMerge.tpl' => '75425a4a3b20b5dadd5e6e9601324c59',
   './modules/UpgradeWizard/start.php' => '46d768e67728644f5a312b3a7ad081c7',
   './modules/UpgradeWizard/Menu.php' => '43d8984853b46c9211f4e9a1481476e1',
@@ -4414,16 +4418,16 @@ $md5_string = array (
   './modules/UpgradeWizard/uw_ajax.php' => '8ed909021c2e338d0a185d01fa046a80',
   './modules/UpgradeWizard/commitJson.php' => 'e02a21bb4ce00448e6bbb98526f860dd',
   './modules/UpgradeWizard/UpgradeRemoval.php' => 'dafb5c6a72582cf510bca521d1c1bcb6',
-  './modules/UpgradeWizard/silentUpgrade_step2.php' => 'd6b88167b2ba9bead941b8ad59c2afb5',
+  './modules/UpgradeWizard/silentUpgrade_step2.php' => '6d3658286db46d41857580f272eda89d',
   './modules/UpgradeWizard/UploadFileCheck.php' => 'e5d0bac07ff5bb02ffaf9db0b605c9f4',
-  './modules/UpgradeWizard/silentUpgrade_dce_step2.php' => 'f177632e4488a84efe1ac762f2a4fedd',
+  './modules/UpgradeWizard/silentUpgrade_dce_step2.php' => '6ff56d8935422615d4a5d3cb078b6e40',
   './modules/UpgradeWizard/layouts.php' => '8e4ae4f83d7825ddb7dca7ef2dfc62b3',
   './modules/UpgradeWizard/uw_emptyFunctions.php' => '81001e5fc9970324677c2b084052eace',
   './modules/UpgradeWizard/commit.php' => '95151a7c632a6f3b8afea1afdd9ec077',
   './modules/UpgradeWizard/processing.gif' => 'd7c43fc19181ee59862601bfce100b41',
   './modules/UpgradeWizard/systemCheckJson.php' => '1b3ca3638039d16eab4dc010373effcd',
   './modules/UpgradeWizard/end.php' => 'ed7cf85069a322ef09632607f5829861',
-  './modules/UpgradeWizard/uw_utils.php' => 'c3c1883359e254cde8d66673ec5e0d3e',
+  './modules/UpgradeWizard/uw_utils.php' => '9837434d4d6640181bbc0908b18d8abc',
   './modules/UpgradeWizard/preflightJson.php' => 'f9430751b95094f6d831f98fbaed9d80',
   './modules/UpgradeWizard/upgradeTimeCounter.php' => '13650e724da4e4fe127bae4a8073565c',
   './modules/UpgradeWizard/uw_files.php' => 'a874d9aca1246f5125cb8007e9a9364a',
@@ -4437,18 +4441,18 @@ $md5_string = array (
   './modules/UpgradeWizard/upgradeMetaHelper.php' => 'e8ec7f254fdb515c8e519d4535c3954d',
   './modules/UpgradeWizard/cancel.php' => '97d22fbe214ea672250b63389101320f',
   './modules/UpgradeWizard/index.php' => '2e05260dc2035a5b5ea0bc24154cd434',
-  './modules/UpgradeWizard/language/en_us.lang.php' => 'ade0438004b4857c218f3560436d8753',
+  './modules/UpgradeWizard/language/en_us.lang.php' => '30b9ca62507c02ea4cfc6392320dc6d3',
   './modules/UpgradeWizard/uw_main.tpl' => '9151371cd86f8d5781f3de7586f89437',
-  './modules/UpgradeWizard/silentUpgrade.php' => '218efc6cf75900269e3cb4b5b0b55c0c',
-  './modules/UpgradeWizard/silentUpgrade_step1.php' => '6f4ad116d0e9a2329afb456cf2da25da',
-  './modules/UpgradeWizard/systemCheck.php' => '39259bbb1c62802fc9b78cd68f97bd3b',
+  './modules/UpgradeWizard/silentUpgrade.php' => '7164ea2f72f43f71aa0fb787f69923f2',
+  './modules/UpgradeWizard/silentUpgrade_step1.php' => '409101acf1c53e3bfea30ed21c714717',
+  './modules/UpgradeWizard/systemCheck.php' => '1e9941dbb5ecbe1cc3220b5dea998030',
   './modules/CampaignLog/Menu.php' => 'b76d9693b31806b29d1c9d2ac554c4d3',
-  './modules/CampaignLog/vardefs.php' => 'e26bc89fca448b9ee5c9fe4e760caa94',
+  './modules/CampaignLog/vardefs.php' => '3c7fe72e50e32f9ff6e59a651f868ca0',
   './modules/CampaignLog/metadata/subpanels/ForTargets.php' => 'af2f4042b8d577709d6a1553854044ca',
   './modules/CampaignLog/metadata/subpanels/default.php' => 'd1f0a98cb4857ff54b5da5bf76aae142',
   './modules/CampaignLog/Popup_picker.html' => 'e31b4805df66cbc1cdfd1d073e7c5f1b',
   './modules/CampaignLog/Popup_picker.php' => 'fc60801e15e752c04da7d00db808ca67',
-  './modules/CampaignLog/language/en_us.lang.php' => '582a76506f501a3c465665ac03477fb5',
+  './modules/CampaignLog/language/en_us.lang.php' => 'ee281f5186532ce2dc280820a40ee25a',
   './modules/CampaignLog/CampaignLog.php' => '47a0965592eb13a399793e136e6166a7',
   './modules/UserPreferences/vardefs.php' => '41b27420d0fa0076903d2f70aaf42325',
   './modules/UserPreferences/controller.php' => '3a24db343c36883966b82102ab15a5ba',
@@ -4463,10 +4467,10 @@ $md5_string = array (
   './modules/Calls/Menu.php' => '858bb3073b45d382034626a6ae3e13dd',
   './modules/Calls/vardefs.php' => 'ac2980875114f34a8d087846144549cc',
   './modules/Calls/CallsQuickCreate.php' => '1d0f9551f8a18c310d5c37f80a7ee82a',
-  './modules/Calls/CallFormBase.php' => '7de54cf6202c109d7d64ef0c327be481',
+  './modules/Calls/CallFormBase.php' => '5d05ab5c814c2b716ca3b7ee015f17a0',
   './modules/Calls/views/view.list.php' => '5b950a91d105b087fdf4a2972f082e54',
   './modules/Calls/views/view.edit.php' => '8c94e4b5f35e895b73cf1236abb252fb',
-  './modules/Calls/Call.php' => '9ca6b9a47ca3ecbbad05d507941b2dfc',
+  './modules/Calls/Call.php' => 'a30932e15848e4ac7c472f4296f16acb',
   './modules/Calls/field_arrays.php' => 'd7fcc70cbde9c22dae63e1bbec29154d',
   './modules/Calls/SubPanelViewInvitees.php' => 'da01bcec9878607ff688f390bfed2cb0',
   './modules/Calls/metadata/searchdefs.php' => '892464b109427176fc0dc9ca870ae1e4',
@@ -4486,7 +4490,7 @@ $md5_string = array (
   './modules/Calls/Dashlets/MyCallsDashlet/MyCallsDashlet.php' => '6bf0c16b793ffcadcf14333530dafe83',
   './modules/Calls/language/en_us.lang.php' => '5f6da2cf0046ce8a179f4f6f68397618',
   './modules/Calls/SubPanelViewInvitees.html' => '4e7eeaa3d0ea3807ce8632669df1e176',
-  './modules/ACLActions/ACLAction.php' => 'b0c570924b9da391507879c3d4653ee9',
+  './modules/ACLActions/ACLAction.php' => '46bd8be93b5b7dc499a1e6da89e3e4e9',
   './modules/ACLActions/Menu.php' => '8e2a919d4a5ef7be81da1d595c040756',
   './modules/ACLActions/vardefs.php' => 'acc6dad81ee8c5f6a1d703b997bab517',
   './modules/ACLActions/actiondefs.php' => 'b9ba5b27e8883574dd8852b6db41a7f3',
@@ -4519,11 +4523,11 @@ $md5_string = array (
   './modules/Connectors/views/view.connectorsettings.php' => '3599b338539419bead9903170b7cc8df',
   './modules/Connectors/controller.php' => '328c25a71868499ad83d263e547921b3',
   './modules/Connectors/ConnectorRecord.php' => 'faabfac339795b814ac06a18b0241f70',
-  './modules/Connectors/connectors/sources/ext/rest/linkedin/config.php' => '75bdb5ff3fe9dd40c72b5a9cb487b6b7',
+  './modules/Connectors/connectors/sources/ext/rest/linkedin/config.php' => '2312b108d865f55e6846d8352d15e86e',
   './modules/Connectors/connectors/sources/ext/rest/linkedin/vardefs.php' => '45c64c53066830c8bd07dda6777b539a',
   './modules/Connectors/connectors/sources/ext/rest/linkedin/mapping.php' => '34344851a94856ebe23bf4af76630fb4',
   './modules/Connectors/connectors/sources/ext/rest/linkedin/linkedin.php' => 'ad4ee690c62d78cfd5b301a09e5973ce',
-  './modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php' => 'ceb1e204e8f06040605e28ec0cbbf7f9',
+  './modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php' => '96a61d905c5f567917ff0a2ddc540185',
   './modules/Connectors/connectors/sources/ext/rest/insideview/config.php' => 'c92b8816212c0ef5203a9c19676fb193',
   './modules/Connectors/connectors/sources/ext/rest/insideview/InsideViewLogicHook.php' => '9ea893764bea3c7ef9007e9c523a41cc',
   './modules/Connectors/connectors/sources/ext/rest/insideview/tpls/InsideView.tpl' => 'f78e9df36a38ce2393c31c9f827e1f68',
@@ -4548,7 +4552,7 @@ $md5_string = array (
   './modules/MailMerge/Step5.html' => 'ee207621a7747804e6a4e900d77e5b26',
   './modules/MailMerge/Save.php' => 'a780b6ad2df09252835cea9b1c708a10',
   './modules/MailMerge/Menu.php' => 'd3e8e7ab675172ecccb60e2c62e55f7a',
-  './modules/MailMerge/Step3.php' => '1cdeb53858e9f22ef278c54527fa993b',
+  './modules/MailMerge/Step3.php' => '6fd5c95815add4d7286ab4a6ac315f03',
   './modules/MailMerge/Step1.php' => 'ca189b4eba690e8875cd2f9085f033ed',
   './modules/MailMerge/Step1.html' => 'fa3c2f2300a66cff3e9bc82634b92970',
   './modules/MailMerge/Step5.php' => 'de1f1b6ae4b3392ef6fc92e4fc27f41f',
@@ -4560,27 +4564,28 @@ $md5_string = array (
   './modules/MailMerge/Step3.html' => 'f37bee3738b70550ebd9f081a8744eaf',
   './modules/MailMerge/modules_array.php' => 'ed165a116ebcaaeab3f956e7bb9bb69c',
   './modules/MailMerge/Step2.php' => 'c9e501e59cb00218144c13755d02b187',
-  './modules/MailMerge/index.php' => 'e9a9e1d1f9aad89e204ddbb1d6d4db86',
+  './modules/MailMerge/index.php' => '31504ab2c826e4ad9a76b94de9c2b089',
   './modules/MailMerge/language/en_us.lang.php' => 'f5b13b5fa8a83802b376b91abe66cb43',
-  './modules/MailMerge/Step4.php' => '8f3ae0f9525f38371e23a7e0577e8a9d',
+  './modules/MailMerge/Step4.php' => '596be6f63149d0858b4e00406a9daa28',
   './modules/MailMerge/Merge.html' => 'b4d4f4f19d8c86c23e52ce934fc07e69',
   './modules/MailMerge/MailMerge.php' => '6c4607789b29ed85dad7966f162ed8d6',
+  './modules/MailMerge/merge_query.php' => '743d3f39a11bf4f694ca73fbb3e40f72',
   './modules/Accounts/Account.js' => 'f7ccc4d757a9102007d2ed61aa1e11de',
   './modules/Accounts/Save.php' => 'fa9ac23fc4be3e690a4ec51366492599',
   './modules/Accounts/tpls/QuickCreate.tpl' => '4694ac305f16b20811c5cb9c0a945fe5',
   './modules/Accounts/Menu.php' => '940b1bfc60dfd617281afd3278c4d9c0',
-  './modules/Accounts/vardefs.php' => '8d1a348040a73cd0732872f9f694db84',
+  './modules/Accounts/vardefs.php' => 'fe57b57fc855ebf8090e2807cc453694',
   './modules/Accounts/ShowDuplicates.html' => '108cb445de43af3649af71f534fd1feb',
   './modules/Accounts/AccountsQuickCreate.php' => 'af3838e16c1a2b717c1227cfd74158fb',
   './modules/Accounts/views/view.list.php' => 'a9e10fd5720e44a1b561018e14c481a2',
   './modules/Accounts/views/view.edit.php' => '0f40a80ec74c239f984660505fc3fee1',
   './modules/Accounts/views/view.detail.php' => 'ca5bac8edc5d5bd243aae331b7127241',
   './modules/Accounts/field_arrays.php' => 'c0a89ae5bbf032a72c700e49620a0b70',
-  './modules/Accounts/Account.php' => '4d5b6b8fafa85d726f10ca736a5d9a99',
+  './modules/Accounts/Account.php' => 'fcb755306a6f5a72e182c8c0b3dbe382',
   './modules/Accounts/ShowDuplicates.php' => '367604f804305c2ece4aefce940cf226',
   './modules/Accounts/metadata/searchdefs.php' => '5b43f8872cad0bd9874de4132142c72e',
   './modules/Accounts/metadata/fieldGroups.php' => 'e0b1a511f6979cc7536df6a72dcf466d',
-  './modules/Accounts/metadata/subpaneldefs.php' => 'b9ae54635a228ea50febd08433a197d5',
+  './modules/Accounts/metadata/subpaneldefs.php' => '04363f613c34ecb04b2ac3028aeb861e',
   './modules/Accounts/metadata/metafiles.php' => '15c04f28844c48dbd5bc04000c3c51dc',
   './modules/Accounts/metadata/quickcreatedefs.php' => '5921d2ba0285f6c214a37ebabed63cb1',
   './modules/Accounts/metadata/editviewdefs.php' => '24bfc7d2291357010742cbf7d3df0691',
@@ -4629,15 +4634,15 @@ $md5_string = array (
   './modules/Campaigns/tpls/WizardCampaignTargetListForNonNewsLetter.tpl' => '58d954e874d02d726a81ff419a9dd0e4',
   './modules/Campaigns/tpls/campaign-inactive.tpl' => '957f2786c766e575827e118e17faa664',
   './modules/Campaigns/tpls/WizardCampaignTargetList.tpl' => '9271eeb2417ab9938f86ed8a197d2d6e',
-  './modules/Campaigns/Campaign.php' => '46db5b4696306c7017f437ac39f9ae42',
+  './modules/Campaigns/Campaign.php' => 'be6de77e9bbabeff88f714a4ea936c89',
   './modules/Campaigns/Menu.php' => '56fe7db6c8c20af19da4a23f76418ecf',
   './modules/Campaigns/vardefs.php' => 'a0711d1a9689d9611c48420d26ce150f',
   './modules/Campaigns/RoiDetailView.php' => '10c41669b01bb56f43388c483418bf3f',
-  './modules/Campaigns/WebToLeadFormSave.php' => '114526cb1aeabf283a5dc3e34df8338c',
+  './modules/Campaigns/WebToLeadFormSave.php' => 'fece56e609c236954a83ec79ccc8220e',
   './modules/Campaigns/WizardHome.html' => 'b1876f7fc33ebb237541ce6769ba2a14',
   './modules/Campaigns/Schedule.html' => '5e032b1c1b2ed03848af26e415926685',
   './modules/Campaigns/DeleteTestCampaigns.php' => '0252ecdf2e0978b07d39c1bb63405864',
-  './modules/Campaigns/WizardMarketing.html' => 'a6f298d3962103607e956934e4f64ef6',
+  './modules/Campaigns/WizardMarketing.html' => '701b3b551518b25f48baeffa7d348a13',
   './modules/Campaigns/Subscriptions.tpl' => '6c5893bda4074f2548f60a35a6f4d2b7',
   './modules/Campaigns/Charts.php' => '8016328431821ce7cc562112c623eab3',
   './modules/Campaigns/WizardMarketing.php' => 'fb008007e1cb396e015362609b8d760b',
@@ -4645,14 +4650,14 @@ $md5_string = array (
   './modules/Campaigns/image.php' => '952e9db32b2c127811e4aeb87b5fda69',
   './modules/Campaigns/WizardNewsletterSave.php' => '47d2c4d3f04b3d53d968e130fc751186',
   './modules/Campaigns/WebToLeadCreation.php' => '37d6e50ae7ddce3140977c6df6743eb2',
-  './modules/Campaigns/utils.php' => '9dec1160fd936aee506043e683ceca22',
+  './modules/Campaigns/utils.php' => 'ede9d5b23276473f4855b2ff0abbc5fc',
   './modules/Campaigns/views/view.newsletterlist.php' => '7fabf9718039ec3786dde791fe397f22',
   './modules/Campaigns/views/view.modulelistmenu.php' => '9198864e2c3029c22427e1897797dc62',
   './modules/Campaigns/views/view.classic.php' => 'b007aa55b60f4bd1f3526f19bd64af4e',
-  './modules/Campaigns/views/view.detail.php' => '5e31fdf7e14323e7b42bdc8e46b443df',
+  './modules/Campaigns/views/view.detail.php' => 'a614df42075aeac74b9912947c06340e',
   './modules/Campaigns/controller.php' => '15ac60b0405f6a24d1097d50b60c0b93',
   './modules/Campaigns/QueueCampaign.php' => '968b3fcbbb80542e302be4914fb4d017',
-  './modules/Campaigns/WebToLeadDownloadForm.html' => '44e9c3f8ff27c646fed38b5da68f9c04',
+  './modules/Campaigns/WebToLeadDownloadForm.html' => '222c9cff7c2a0f077f6d60a02a7aaee4',
   './modules/Campaigns/field_arrays.php' => '80383b144bee59ff39130f2ce6bb3b8d',
   './modules/Campaigns/Schedule.php' => '1d9b5fcb4830b99382a7e3ba46a7c9fe',
   './modules/Campaigns/action_file_map.php' => '01327f193ceaccf4465ebafbad0b61d8',
@@ -4674,8 +4679,8 @@ $md5_string = array (
   './modules/Campaigns/metadata/listviewdefs.php' => '3cad66e6e8f3917f2f49e0e88d89a64c',
   './modules/Campaigns/metadata/additionalDetails.php' => 'fe10d71bc807363897c878614af4bc2b',
   './modules/Campaigns/metadata/studio.php' => '7f527321f988b1b525bb0c995b6d983a',
-  './modules/Campaigns/metadata/detailviewdefs.php' => '1215251743f25119f7eee2502e851401',
-  './modules/Campaigns/WizardHome.php' => '13e160667cf44e1d30bfae1ec1124128',
+  './modules/Campaigns/metadata/detailviewdefs.php' => '13733b7038b83c10e10a78403e29acdc',
+  './modules/Campaigns/WizardHome.php' => '164766af4c1ff0b404fbd09f7e021e58',
   './modules/Campaigns/Dashlets/TopCampaignsDashlet/TopCampaignsDashlet.tpl' => 'ea825d2c46d621e689d19c4390345892',
   './modules/Campaigns/Dashlets/TopCampaignsDashlet/TopCampaignsDashlet.php' => '4ef73bbcfcd902457c79ef170d75a516',
   './modules/Campaigns/Dashlets/TopCampaignsDashlet/TopCampaignsDashletConfigure.tpl' => 'df7707f57edab45115cf42900b0215cb',
@@ -4683,10 +4688,10 @@ $md5_string = array (
   './modules/Campaigns/Popup_picker.html' => '6c53bcfbf3e00b6ce2376eb33bb25e82',
   './modules/Campaigns/RemoveMe.php' => '0ecd6d1b56bf9be7a5366acc5273a927',
   './modules/Campaigns/CampaignDiagnostic.php' => '971bc361788a7cd3677315a23ffc71da',
-  './modules/Campaigns/WebToLeadCapture.php' => 'f93e6f45e1ad20e42dd5ffba597043b1',
+  './modules/Campaigns/WebToLeadCapture.php' => 'cc2fcc55f8f7f7a6c0575e523d0b8b4a',
   './modules/Campaigns/WebToLeadCreation.html' => '05e6a884007096050f3b3c9d23b4adcc',
   './modules/Campaigns/Popup_picker.php' => '1dc35486da8c1bfdbd81d571c53b0eae',
-  './modules/Campaigns/language/en_us.lang.php' => 'e18a0df3fdcd794d970f9ca7f0549257',
+  './modules/Campaigns/language/en_us.lang.php' => 'd6862113c333f321ddcea53237cb1893',
   './modules/Campaigns/ProcessBouncedEmails.php' => 'fc27f459dea7f56c4119ee284e2850dd',
   './modules/Campaigns/MailMerge.php' => '70fee5f3d6433de51b52cde759428168',
   './modules/Campaigns/TrackDetailView.tpl' => '9f8c6b5b42475e01c700631791c80219',
@@ -4711,7 +4716,7 @@ $md5_string = array (
   './modules/Employees/metadata/listviewdefs.php' => '41c458a66e549068c79483258175198b',
   './modules/Employees/metadata/studio.php' => '69518398640ba7ad59a093a447d2af6c',
   './modules/Employees/metadata/detailviewdefs.php' => '7c931e608a51c630eedfd23315bd52e5',
-  './modules/Employees/Employee.php' => '792d699b07950e9759bb152d5fb6ce8e',
+  './modules/Employees/Employee.php' => 'cc2aeb8ddf7b352db24d2f62e99d3b79',
   './modules/Employees/Popup_picker.html' => '2c5a03f7134c836c7dc66048343273d4',
   './modules/Employees/EmployeesStudioModule.php' => 'c375357117147eb5e1e2845861ed68f7',
   './modules/Employees/Popup_picker.php' => '8dd56afa5b0762070993b9cecea17adc',
@@ -4731,7 +4736,7 @@ $md5_string = array (
   './modules/Activities/metadata/subpaneldefs.php' => '653c92853e062ec5a9a4f957b2bcddc0',
   './modules/Activities/Popup_picker.html' => 'fe2b0d186e38b29321a8db0cefabde30',
   './modules/Activities/SubPanelViewContacts.html' => 'ba5a475b493fcfb2b9dcec79380f9137',
-  './modules/Activities/Popup_picker.php' => '483ddbedb2af8d9551ef8c4d456cb5a2',
+  './modules/Activities/Popup_picker.php' => 'e4826314968c361215eea2fef4f9b2b5',
   './modules/Activities/language/en_us.lang.php' => '915ca75c37f8eaf6212cb4638e1b5bbc',
   './modules/Activities/Forms.php' => 'd3b4ae8c5adefe0459f8191015aa963a',
   './modules/Activities/SubPanelView.html' => '9dc12c6183eb5c4d4dcb907f9732f142',
@@ -4756,7 +4761,7 @@ $md5_string = array (
   './modules/vCals/vardefs.php' => '6da81e3f0d0c44fa2a0110c8be208e17',
   './modules/vCals/HTTP_WebDAV_Server_vCal.php' => '5a6b18b368756d72906cb30a6a8c5bbe',
   './modules/vCals/field_arrays.php' => 'edf597f757a7476101f8c0a6f9ae7bd5',
-  './modules/vCals/vCal.php' => 'fa6be09ed4e177d569a1427d64862f7a',
+  './modules/vCals/vCal.php' => 'bd0231bc97af713a77bcd6caee73727b',
   './modules/Bugs/Bug.php' => '3badfdca740aa6547bc04644efa3c470',
   './modules/Bugs/tpls/QuickCreate.tpl' => '8cb257fc67aa10e35b93927896fcc61f',
   './modules/Bugs/Menu.php' => '08b918b895b6e4e30507e6329482da6e',
@@ -4782,7 +4787,7 @@ $md5_string = array (
   './modules/Bugs/Dashlets/MyBugsDashlet/MyBugsDashlet.php' => 'fc5cf063e436a99530f037216aabd849',
   './modules/Bugs/language/en_us.lang.php' => '506e05f9c704d0b390d55f8181e26040',
   './modules/Bugs/BugsQuickCreate.php' => '0b3a5eddc45fccfe8235a02c645f4432',
-  './modules/SchedulersJobs/vardefs.php' => 'cc431c17ad9e6120e389a8339fc23636',
+  './modules/SchedulersJobs/vardefs.php' => 'c012b25fedf953207d2b3908a5e869d4',
   './modules/SchedulersJobs/field_arrays.php' => 'a60602bff510c911ba742833413eba93',
   './modules/SchedulersJobs/metadata/subpanels/default.php' => 'c3629eb7760c975cdb22ea22cbe16a9c',
   './modules/SchedulersJobs/language/en_us.lang.php' => 'b0d407e5774510304e1b0ea6c794e25c',
@@ -4791,10 +4796,10 @@ $md5_string = array (
   './modules/Contacts/ContactOpportunityRelationshipEdit.php' => '989748fbb9350215e6fc966a50b2523d',
   './modules/Contacts/Email_picker.html' => 'ffc5a233b91fe04b5c27e1e4d07487a7',
   './modules/Contacts/Save.php' => '225e8a5d4fb84d5d494980ca7bd2e7d9',
-  './modules/Contacts/tpls/QuickCreate.tpl' => '5eb84da4884c260e1659d2c89ed2cf04',
+  './modules/Contacts/tpls/QuickCreate.tpl' => 'c460011bd34d580b5f16c1adfdede9c4',
   './modules/Contacts/Menu.php' => '3cdb52ed118ba2c8f466607076501330',
-  './modules/Contacts/vardefs.php' => 'c5569822f3f481596bf8b3b58d4ee705',
-  './modules/Contacts/ContactFormBase.php' => '1e4237e769aa2ce5026e42a5249ccf71',
+  './modules/Contacts/vardefs.php' => '6c909504d34b50c16807fdd8067f857e',
+  './modules/Contacts/ContactFormBase.php' => 'f0aadb90140e4f37efc83f654e074502',
   './modules/Contacts/ShowDuplicates.html' => '71949d6852e24da1346b2f5799e6eb94',
   './modules/Contacts/views/view.closecontactaddresspopup.php' => 'bb8bdfe65be31ba0dced32cc16a2a0ae',
   './modules/Contacts/views/view.quickcreate.php' => 'b6287d02b002b75be781e8fde11bfab3',
@@ -4802,11 +4807,11 @@ $md5_string = array (
   './modules/Contacts/views/view.contactaddresspopup.php' => '67fc0a2a7251d16305f1685c4149703e',
   './modules/Contacts/views/view.mailmergepopup.php' => 'd1a1ee6cb1c0daf825cfecc59689055b',
   './modules/Contacts/views/view.list.php' => '1a8f5e97a659c4642003594954d09744',
-  './modules/Contacts/views/view.edit.php' => 'fed89b949b38a79b6eae82d3810281eb',
+  './modules/Contacts/views/view.edit.php' => '159c918cce8d1b5b698ccb6359034002',
   './modules/Contacts/views/view.validportalusername.php' => 'fd1109ff4ca90d838a4173e98cc30491',
   './modules/Contacts/views/view.detail.php' => '249d6ba8559860bfa63ba0d23922fe1d',
   './modules/Contacts/controller.php' => 'b2e9c61cd9ebcf9dd0adf8848a0d1962',
-  './modules/Contacts/AcceptDecline.php' => '1dfb3390d5cced88009482d94c85129d',
+  './modules/Contacts/AcceptDecline.php' => '97aabcfb89a1a9587b8a01331f96f171',
   './modules/Contacts/BusinessCard.php' => 'e2dd2c205a177cea20e3bb9f9ea347db',
   './modules/Contacts/Address_picker.html' => '0185fed92bdfa3b09bad5727a382ec92',
   './modules/Contacts/field_arrays.php' => '7318b83ae77d80524a51e2d5840d4a03',
@@ -4816,7 +4821,7 @@ $md5_string = array (
   './modules/Contacts/metadata/subpaneldefs.php' => 'c80e345ab5a69009ff7e08c64d20c62c',
   './modules/Contacts/metadata/popupdefsEmail.php' => 'cc8564b0bda07e50183bd184e9ab8035',
   './modules/Contacts/metadata/metafiles.php' => '589cd33eb9432e80a1f2606dfa63b426',
-  './modules/Contacts/metadata/quickcreatedefs.php' => 'a17d61a34f6cc5acaa37adb1611270c0',
+  './modules/Contacts/metadata/quickcreatedefs.php' => 'ba280506600aad47129304b835bb9063',
   './modules/Contacts/metadata/editviewdefs.php' => 'f553d0823fde7874f5d6ea75ab122ae8',
   './modules/Contacts/metadata/SearchFields.php' => 'e43dd6acb000854cb76f96a26e5ef002',
   './modules/Contacts/metadata/popupdefs.php' => '0befccf66814c8cf3a6c1a62562c93a7',
@@ -4834,13 +4839,13 @@ $md5_string = array (
   './modules/Contacts/metadata/studio.php' => '8a4fa54f580072cbcc66ef88f6c0825a',
   './modules/Contacts/metadata/detailviewdefs.php' => '19a533f81b332ef747b1ba51f7d66064',
   './modules/Contacts/MailMergePicker.html' => '29e57e97075c896b1aa241aecf730ed7',
-  './modules/Contacts/Contact.php' => '4dfbde4f9544143a56ecec4fea8597fa',
+  './modules/Contacts/Contact.php' => '5f70ef59daf6687fd5df67bf7f65d4f8',
   './modules/Contacts/Dashlets/MyContactsDashlet/MyContactsDashlet.meta.php' => 'b42ca325847c88851e88c5cfde0ab29b',
   './modules/Contacts/Dashlets/MyContactsDashlet/MyContactsDashlet.php' => '44485fa894daf812608a17fc14db940e',
   './modules/Contacts/Dashlets/MyContactsDashlet/MyContactsDashlet.data.php' => '06342bff6da916febc1f1a52732a564f',
   './modules/Contacts/ContactOpportunityRelationship.php' => '9c6fd1dec44848c6d6f42a19cd36e3db',
   './modules/Contacts/ContactsQuickCreate.php' => '5a7fa4581d4c3bc6b4eaa2b08e327d07',
-  './modules/Contacts/Popup_picker.php' => '16cf33d0041933734636e5e7647defeb',
+  './modules/Contacts/Popup_picker.php' => '2e41b64f753bbb74ed3542a2543f8235',
   './modules/Contacts/language/en_us.lang.php' => '0bf86afb20f95014a82ff20176cb0af6',
   './modules/Contacts/BusinessCard.html' => '4fc58cd95d20b120454df377620ec00d',
   './modules/Contacts/SugarFeeds/ContactFeed.php' => '0f5dbc3b7f436278b4ad20103306a3ba',
@@ -4888,22 +4893,22 @@ $md5_string = array (
   './modules/Import/vardefs.php' => '60cff61c52c1283ffe7dd161c28c074a',
   './modules/Import/ImportDuplicateCheck.php' => '98eee0e91c80c0ab173076538acceeba',
   './modules/Import/ImportFieldSanitize.php' => 'd32a76f0cabb2f5dba570ae8b0d440e3',
-  './modules/Import/Importer.php' => 'cb373285ae8cff79ca2a9fd5e075d242',
+  './modules/Import/Importer.php' => 'f4ab99e7a716228d8bfa6a220bc6a1ba',
   './modules/Import/views/view.dupcheck.php' => '80fded0509056a60cb59280a656b4e7d',
-  './modules/Import/views/view.confirm.php' => 'b8e332baea7af212bbe28d5288bd2f4e',
+  './modules/Import/views/view.confirm.php' => '66c9964b3c6cbffcbe05bf18b14b8948',
   './modules/Import/views/view.step2.php' => '0d92e6b7b74f46b33ad4764cc10bbb4a',
   './modules/Import/views/ImportListView.php' => '8a86c159a94446b315785c4ca0f8fa25',
   './modules/Import/views/view.step4.php' => '2759ba63cac39f2d75fa521bbc9c2b3d',
-  './modules/Import/views/view.last.php' => '36384e452d9a5f2b24d24bc684927413',
+  './modules/Import/views/view.last.php' => 'bc5a15d0de7e49c018e5f4514afc373f',
   './modules/Import/views/ImportView.php' => '2f5f4cdad18fe3d61da136238dc07fd0',
   './modules/Import/views/view.undo.php' => '445e58df91429d47e2e34192ea4f7892',
   './modules/Import/views/view.step1.php' => '7a6f866ef1917412702b560b613d2a9c',
   './modules/Import/views/view.extdupcheck.php' => 'bfbb7c5266e79fe247fdb63a0e9ec37a',
-  './modules/Import/views/view.step3.php' => '35baf6fa30f2bcd9035162655898aed9',
+  './modules/Import/views/view.step3.php' => 'fe493834f72ac6fa5da8cb1d7f61ae1b',
   './modules/Import/views/view.error.php' => '27af21ad339434f78abc51a28c8a6f0b',
   './modules/Import/controller.php' => 'ec75d24cc37cc2b6528f9d2c316aa537',
   './modules/Import/CsvAutoDetect.php' => '0388c726dd7ffdcd44190eb1aaac9aad',
-  './modules/Import/ImportCacheFiles.php' => '22140231421a927d4907017d5b5057e1',
+  './modules/Import/ImportCacheFiles.php' => '8847d29eafee0b588ce907e6ae498743',
   './modules/Import/language/en_us.lang.php' => '82467768109f364d7cfe422a25de1c23',
   './modules/Import/sources/ImportDataSource.php' => '3736d8c8e5edd94906477f7de408c7e0',
   './modules/Import/sources/ExternalSourceEAPMAdapter.php' => '3225e6643f00846460a653872e652e25',
@@ -4961,7 +4966,7 @@ $md5_string = array (
   './modules/Project/SubPanelView.html' => 'a8cfd450c5a10dac0f401a57c430a519',
   './modules/Project/ProjectQuickCreate.php' => '0b45e5508713bd8397d38194ed2743ae',
   './modules/Meetings/jsclass_scheduler.js' => 'b1364e950a651985cf5523353211bfde',
-  './modules/Meetings/duration_dependency.js' => 'a4d8be7dae3be9561c174d0743f50a04',
+  './modules/Meetings/duration_dependency.js' => '68137bd02d0b9cff86e857ffe2d758a8',
   './modules/Meetings/Save.php' => '82a55c7692d587e20236135aca956f43',
   './modules/Meetings/tpls/footer.tpl' => 'e0a83373e481789efd51511c01acd3e6',
   './modules/Meetings/tpls/header.tpl' => 'd2ecbc05b238906de6b4dfd3c0e06129',
@@ -4971,9 +4976,9 @@ $md5_string = array (
   './modules/Meetings/tpls/detailHeader.tpl' => '80c5550af52dc424831101182a9a0dce',
   './modules/Meetings/tpls/reminders.tpl' => '9d18ebe8e3a253e5643ecc5384367c2f',
   './modules/Meetings/Menu.php' => '63348eb6a3845e5d48389fe80ed6bfff',
-  './modules/Meetings/vardefs.php' => '81f816ee7a42038336581f94415ef4b1',
+  './modules/Meetings/vardefs.php' => '36101b541ce81f67bb17078a3bc17063',
   './modules/Meetings/JoinExternalMeeting.php' => 'b71a1a110ff5483fc45d49859d1a5ed4',
-  './modules/Meetings/Meeting.php' => '16f81501c52ca4063dabfc9848076637',
+  './modules/Meetings/Meeting.php' => '74f83a963ce41c971ffe9ac9c02c9528',
   './modules/Meetings/views/view.listbytype.php' => '61e0b1d6c77c420c061cc4edccc30b8e',
   './modules/Meetings/views/view.list.php' => 'ba747ebcc7fff9f6036e532056d12fb8',
   './modules/Meetings/views/view.edit.php' => '12b46ccee3f27ce1dfc45187db422e59',
@@ -4981,8 +4986,8 @@ $md5_string = array (
   './modules/Meetings/SubPanelViewInvitees.php' => 'a38faa53743722e08440fb36863e1cbf',
   './modules/Meetings/metadata/searchdefs.php' => '1812616f0e6dc434312700ebdcf5fe51',
   './modules/Meetings/metadata/subpaneldefs.php' => '9fcb40ed13d8cffc9cc054e0908726b1',
-  './modules/Meetings/metadata/quickcreatedefs.php' => 'aa67a8ae47e6ca59457cfa438671ccf4',
-  './modules/Meetings/metadata/editviewdefs.php' => 'edc1d07db661cb05b2cf3d023c19b777',
+  './modules/Meetings/metadata/quickcreatedefs.php' => 'd32ee617268e3c5aa6e97e9e796d81f3',
+  './modules/Meetings/metadata/editviewdefs.php' => '72c96ea4f33ace58cf879e7ad660723e',
   './modules/Meetings/metadata/SearchFields.php' => '06b45aadf77c191d52f16b79c912f896',
   './modules/Meetings/metadata/subpanels/ForHistory.php' => '28f07ed10e8d45bca8121a9bd1f76fba',
   './modules/Meetings/metadata/subpanels/ForActivities.php' => '06fbdaca02a664e63b06dd5cef35ca0a',
@@ -4990,15 +4995,15 @@ $md5_string = array (
   './modules/Meetings/metadata/listviewdefs.php' => 'fa302246f3795a3fcfe46455158eccc7',
   './modules/Meetings/metadata/additionalDetails.php' => 'c98a17cfb10dade0d36e0596c87a6a72',
   './modules/Meetings/metadata/studio.php' => 'd8ec9c1a4d2c17483fdce4a8753e61ca',
-  './modules/Meetings/metadata/detailviewdefs.php' => '5f67a6b40e341e61c6dc83cccf197221',
+  './modules/Meetings/metadata/detailviewdefs.php' => 'c1e4cacdb55a8d50419815b28764b5da',
   './modules/Meetings/action_view_map.php' => '783a7b699c3b3ce049ca2e3bde08d856',
   './modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.data.php' => '6fc43996c0f0b8a25c63b19b7b80a650',
   './modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.meta.php' => '1f17c035ab5229249ccb4dbbb51a1d39',
-  './modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php' => '7823935ea41c4e7139c51012a2a22741',
+  './modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php' => '4a6c86deb8c094a5eee079604ea3af3b',
   './modules/Meetings/MeetingsQuickCreate.php' => '5e67b447ae39ad80afe5588a4a293388',
   './modules/Meetings/language/en_us.lang.php' => '4fcd9d9fce88d839ec13baa9600f7cd2',
   './modules/Meetings/SubPanelViewInvitees.html' => '7f9d1da5e8384457cadabf14412a88a5',
-  './modules/Meetings/MeetingFormBase.php' => 'b5d63f8d12bcb4753aa2de28ecd74236',
+  './modules/Meetings/MeetingFormBase.php' => '125d67b87d70e61e2e074c9279bb4090',
   './modules/Administration/RepairIndex.php' => '31d55e4ce8069277191685e503ade848',
   './modules/Administration/RepairActivities.php' => '51359b6e6594e7587fdfd3ef50ebb944',
   './modules/Administration/RepairSeedUsers.php' => '835c36a2118b92fb8c1bcdad8f49baae',
@@ -5010,14 +5015,14 @@ $md5_string = array (
   './modules/Administration/repairSelectModule.php' => '0b5056adf4e7229d67c20b60f8842bba',
   './modules/Administration/UpgradeWizard_prepare.php' => '79d0670ca24e0948af4a4396ba3c689a',
   './modules/Administration/QuickRepairAndRebuild.php' => 'b4006c2d2925ba20d5403b6a081e1be5',
-  './modules/Administration/DiagnosticDelete.php' => 'a7bad690f1b209eb5532ef4ae3795407',
+  './modules/Administration/DiagnosticDelete.php' => '800d39b37b8bbd477de71a27eba085b2',
   './modules/Administration/Save.php' => '15bb3509086e8bbadaa0564c02c780b6',
   './modules/Administration/UpgradeWizard.php' => '44260efe5d777ba21db42e70f378900f',
   './modules/Administration/ncc_config.php' => '42cd8fc45ba496786a136fe08ab93166',
   './modules/Administration/Menu.php' => '8516a0e9af7e0a5fcc61b4d87b123cc2',
   './modules/Administration/vardefs.php' => 'a4b3781befd4731cfacc25e7ab51380d',
   './modules/Administration/Upgrade.php' => '9da6aaf655be2c986158e50a772d904f',
-  './modules/Administration/SugarSpriteBuilder.php' => '1091cb3cb3a6b4191542933450950ba2',
+  './modules/Administration/SugarSpriteBuilder.php' => '95bb50747b7f6903959bb58404c4a586',
   './modules/Administration/UpgradeWizardCommon.php' => '6692078482ee14f39d6120ed762a83d8',
   './modules/Administration/index.tpl' => 'c934bbbb1b6c1d224160d3eb2474f880',
   './modules/Administration/ExportCustomFieldStructure.php' => 'ee31a1faf8364f2164b6b0dd3561c920',
@@ -5027,14 +5032,14 @@ $md5_string = array (
   './modules/Administration/RebuildSchedulers.php' => '8a019b515ec6b861b5d8389d8db6cbc4',
   './modules/Administration/RebuildJSLang.php' => 'c805d230536a0a2588b2f354bebca2f7',
   './modules/Administration/Administration.php' => '8a972beb37ff7f35f024f96c42fea740',
-  './modules/Administration/DiagnosticRun.php' => 'a9f0896ee15a3098940eb153b2ee7a5b',
+  './modules/Administration/DiagnosticRun.php' => '71ec61f38b53d9c45430ad010f073744',
   './modules/Administration/views/view.configureajaxui.php' => '3668e9bc0b0bb4cb389d8a848d4c4ec4',
   './modules/Administration/views/view.themesettings.php' => 'ebb08498472f303fc6833164c9dc35db',
   './modules/Administration/views/view.configuretabs.php' => 'b32e7df996417adb19883421b87597dc',
   './modules/Administration/views/view.globalsearchsettings.php' => 'bb86ea13c8914e6aa69fe5924019e1ce',
   './modules/Administration/views/view.languages.php' => 'eca8a961cbf9e45bb21127ee1db25768',
   './modules/Administration/views/view.repair.php' => '187ce3268bf6576687701d2dbe42dd57',
-  './modules/Administration/views/view.backups.php' => '7f4ca98837f1b1c566e93d7a827d95d0',
+  './modules/Administration/views/view.backups.php' => '23ad77a7ac7d106221079c6d20b43ed6',
   './modules/Administration/controller.php' => 'e83cadf5313419dd7662b951e1bb2bac',
   './modules/Administration/Async.php' => '3a6cc7676af1b2c884eb7113cc8fd178',
   './modules/Administration/SupportPortal.php' => '0bd583e18376f7ec8f0a2f57b8b0d104',
@@ -5060,10 +5065,10 @@ $md5_string = array (
   './modules/Administration/UpgradeIISAccess.php' => 'fa50ac29309a95d7a325c1ec7444013c',
   './modules/Administration/updateTimezonePrefs.php' => '46aea97ac223ee9e40328b39696164b3',
   './modules/Administration/updater_utils.php' => 'ca5c63f9b7d4590abfed013b6f3ec89f',
-  './modules/Administration/DiagnosticDownload.php' => '8b2a5ba14793dd92341f37f0713479bc',
-  './modules/Administration/DisplayWarnings.php' => '8f5a56a05a9877990ff6cad4ad5af866',
+  './modules/Administration/DiagnosticDownload.php' => '5a09f54e964d71d49211bde5cb49a449',
+  './modules/Administration/DisplayWarnings.php' => '3b14925531f2d1011ecc1ce03478314f',
   './modules/Administration/RepairJSFile.php' => 'f8cf5338d5659ea27a2662d44150b7fd',
-  './modules/Administration/metadata/adminpaneldefs.php' => '78bec11e31f060925773ca8d22e75c43',
+  './modules/Administration/metadata/adminpaneldefs.php' => 'f851308d587e01b1d5558326ef0e0e66',
   './modules/Administration/metadata/SearchFields.php' => '787123be8e7e907e9754da7bf36ead0a',
   './modules/Administration/clear_chart_cache.php' => 'a4be1a29a9f98f1f86215c6540c0b712',
   './modules/Administration/action_view_map.php' => 'e70c869d8157de4584b4da0aec2117e4',
@@ -5076,14 +5081,14 @@ $md5_string = array (
   './modules/Administration/PasswordManager.php' => '11ef65dbd8f4ef09c813483507fff134',
   './modules/Administration/Locale.tpl' => 'bb9afeb5e9db4919bdcd1808cabf2999',
   './modules/Administration/RebuildExpressionPlugins.php' => 'a926f301737fb11ba1a71673eb51424c',
-  './modules/Administration/language/en_us.lang.php' => 'b0bd2347c984db30c60e1870bb8c7c7e',
+  './modules/Administration/language/en_us.lang.php' => '45beb41d63e6c2dad275e3037d1f1f7f',
   './modules/Administration/UpgradeHistory.php' => 'a9ec8a2612a5d3404e974d53de8b4311',
   './modules/Administration/upgrade_custom_relationships.php' => 'fe1239f73daa16e6a8b7f3170c8cad23',
   './modules/Administration/ImportCustomFieldStructure.php' => 'fd2baf8134f11375810c5c4daa52c889',
   './modules/Administration/Updater.php' => '177bc5734aaf618cc4886b19a44c1010',
   './modules/Administration/undoupdateclass.php' => '7c8277e09ebb2b732c603b2ceca3e2f6',
   './modules/Administration/Forms.php' => '81d615540c4075e633301ffec2f7424c',
-  './modules/Administration/Diagnostic.php' => 'f7d3ce6daca382c290e27128e0690cf0',
+  './modules/Administration/Diagnostic.php' => 'a9c7be5c5d94649b71067ce3f646a09e',
   './modules/Administration/RebuildRelationship.php' => '4e9898d144c86885c57dadf947c715f0',
   './modules/Administration/index.html' => '9e7b8e111c32321495ca80edde1ff5dc',
   './modules/Administration/RebuildConfig.html' => 'b1bd5b162208b1b2d71d8193c9906f01',
@@ -5126,7 +5131,7 @@ $md5_string = array (
   './modules/Currencies/language/en_us.lang.php' => 'fdf361824c56c986633cfe6e40a714bc',
   './modules/Currencies/Forms.php' => 'ec975a705ebda21ec50b9036e4c3e717',
   './modules/Currencies/iso4217.php' => '8d3c094b1aa7eab1135dc11a013909c5',
-  './modules/Currencies/Currency.php' => '7882636e62289b9c24ec02fb491f95f8',
+  './modules/Currencies/Currency.php' => '5345fa3e352da64897ab902616c791d1',
   './modules/ProspectLists/Save.php' => 'ab26cd4b0cd701a52ce48617ad80f5f2',
   './modules/ProspectLists/Menu.php' => '2e3b6c7003f8c707d2985a464512dcbc',
   './modules/ProspectLists/vardefs.php' => '6dc44a3d8c2d68b206b07259443adcc5',
@@ -5151,7 +5156,7 @@ $md5_string = array (
   './modules/ProspectLists/Forms.php' => '269c49c1f56b747ef00c0c192176890d',
   './modules/ProspectLists/SubPanelView.html' => '66681a7823902dfe31a56ff210a128dc',
   './modules/Prospects/Save.php' => 'f4356f640dabc3102bec019b66cde522',
-  './modules/Prospects/tpls/QuickCreate.tpl' => '4694ac305f16b20811c5cb9c0a945fe5',
+  './modules/Prospects/tpls/QuickCreate.tpl' => '48ace80607d75ccb2269d253f881b2cc',
   './modules/Prospects/tpls/DetailViewHeader.tpl' => 'dd705a91289d9c51886ecc83e55a0a3b',
   './modules/Prospects/Menu.php' => '031eb2423070dee242ec8f0a7c7d43e1',
   './modules/Prospects/vardefs.php' => 'a2f530627be82745b14f1da5a4e54b6a',
@@ -5184,7 +5189,7 @@ $md5_string = array (
   './modules/Home/Menu.php' => '9f95dba812226231c76b38da981f6513',
   './modules/Home/sitemap.tpl' => '3619e568a9ad07ab4b5e35dd3780b298',
   './modules/Home/views/view.additionaldetailsretrieve.php' => 'b0ca3fbad18270986844993c737e49d3',
-  './modules/Home/views/view.list.php' => '3cd80d79fd232f21279f931557a49b43',
+  './modules/Home/views/view.list.php' => 'ddcaf125190670eb41676357c6e8f903',
   './modules/Home/views/view.modulelistmenu.php' => 'a1a8df55d774b049f8728fd70d8de48c',
   './modules/Home/SubpanelCreates.php' => '798fa6f7a2355b85c7a2ce071354cac5',
   './modules/Home/PopupSugar.php' => '2f0b676cc4df0d744543bf69851dc2e5',
@@ -5194,15 +5199,15 @@ $md5_string = array (
   './modules/Home/UnifiedSearchAdvanced.tpl' => 'e0c7d63a16de2718887838c5617ac706',
   './modules/Home/action_view_map.php' => '42ac212dbe9fd781aa849d252222a781',
   './modules/Home/TrainingPortal.tpl' => '1e181d4b3f021a74b7ce165a71558863',
-  './modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php' => '50876c5978b2e005def948f3ba7e1095',
+  './modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php' => 'b1d170d157bdbd192a1aab8d2141fa56',
   './modules/Home/Dashlets/ChartsDashlet/ChartsDashletScript.tpl' => '2df14de190bfe8608d647ab00264fd0e',
   './modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.en_us.lang.php' => 'eba1a456bf639ba649b8bec503776be2',
   './modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.meta.php' => '4a0ce2d02f29a09782be1eeb4ce5c00d',
   './modules/Home/Dashlets/SugarNewsDashlet/SugarNewsDashlet.php' => '7932f3d285d87d2301a9d1fad80fe157',
   './modules/Home/Dashlets/SugarNewsDashlet/configure.tpl' => '0ef83fffcdadfb36f215d79e959b6db3',
   './modules/Home/Dashlets/SugarNewsDashlet/SugarNewsDashlet.meta.php' => '312bbeb0e2b8a1cac49bcf5dc76844dd',
-  './modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php' => 'b933bddfa00569d2a8e0cfc8a6ce53a9',
-  './modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php' => 'd68bb9a8a687928b0aa7063b028c419c',
+  './modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php' => '3954294246af7bb32d5cbf28613a83f3',
+  './modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php' => '6aa40f4f23c03eb37ca9f74f1200464d',
   './modules/Home/Dashlets/iFrameDashlet/configure.tpl' => '0ef83fffcdadfb36f215d79e959b6db3',
   './modules/Home/Dashlets/RSSDashlet/RSSDashlet.en_us.lang.php' => '03d11d401bba0b0df15f225c7cf54879',
   './modules/Home/Dashlets/RSSDashlet/RSSDashlet.icon.jpg' => '7b0cb2ec97ce8e71d74d60a0da81ba53',
@@ -5228,27 +5233,27 @@ $md5_string = array (
   './modules/Home/Dashlets/JotPadDashlet/JotPadDashlet.php' => '30ed52af9d9adf1248e75aeb79f13da2',
   './modules/Home/Dashlets/JotPadDashlet/JotPadDashletOptions.tpl' => 'a071ef1e73c24bb302f83cb1bc7d7de6',
   './modules/Home/dashlets.php' => 'd7ee77314c504c10c60f385fe3f97cda',
-  './modules/Home/index.php' => '401f05cd174b6ea2ed72eccfb9d13fa3',
+  './modules/Home/index.php' => 'ac7320ff1125be9efff83bdc6f38b3f5',
   './modules/Home/language/en_us.lang.php' => '1fbbe8b4add8d2580060c3638220e011',
   './modules/Home/SaveSubpanelLayout.php' => '91dfc82a810257041e19df963b342b55',
   './modules/Home/UnifiedSearchAdvancedForm.tpl' => '6213260d588340fc97e52ec0f3e1b977',
-  './modules/Home/UnifiedSearchAdvanced.php' => '8f337869ca5b5e84cb8ee6ce6f433b13',
+  './modules/Home/UnifiedSearchAdvanced.php' => 'f4d08a6b065441300e397132cbcd6125',
   './modules/Home/quicksearchQuery.php' => 'c304b59cdbfb6d25a8c212c67c67e92a',
   './modules/Home/sitemap.php' => '14f8d01f2c88bf7ba4a54cc980ad46a3',
   './modules/Home/UnifiedSearchAdvancedResults.tpl' => 'db10bb4e894f46054ca120ec74569981',
   './modules/Home/LastViewed.php' => 'e4fd8c8ebf25ad8a93173deabf4b35bc',
   './modules/Home/AddToFavorites.php' => '2d1240598be9e7f74c497fe3a6578868',
   './modules/Home/TrainingPortal.php' => '1ec4a300d6dfd51f80eb642eee05f0f0',
-  './cache/include/javascript/sugar_grp_jsolait.js' => '9aced6d7d2669515690f61e506834ed9',
-  './cache/include/javascript/sugar_grp_quickcomp.js' => '97ef0cdef727c31825ff2ced21dff3cc',
-  './cache/include/javascript/sugar_grp_emails.js' => 'e461a6bd9e7ccd3c0e60940153e47933',
+  './cache/include/javascript/sugar_grp_jsolait.js' => 'c2b9bc248224b3c1001b19487f3ab99b',
+  './cache/include/javascript/sugar_grp_quickcomp.js' => '53eeda5a463ab179f2cac0b0221c12d8',
+  './cache/include/javascript/sugar_grp_emails.js' => '966628c4d758082a9a8250ef64d1c5b1',
   './cache/include/javascript/sugar_grp_yui2.js' => '53c8d4d026a0adc7ea775e6488245de5',
   './cache/include/javascript/sugar_grp_yui_widgets.css' => '17f5b268fda1a8a3e27b41ebefe4d408',
   './cache/include/javascript/sugar_grp_yui_widgets.js' => '35fe43cba48260f75b169dd1af5c64fe',
   './cache/include/javascript/sugar_grp1_yui.js' => '9c3853420e26cad638181691de71e991',
-  './cache/include/javascript/sugar_field_grp.js' => 'e7a749c76598d005a66822240e4e3d15',
-  './cache/include/javascript/sugar_grp1_jquery.js' => '5dcb5f643243f920ae452c3233b8a72d',
-  './cache/include/javascript/sugar_grp1.js' => 'd318c906035664841e008b43f33c4a1e',
+  './cache/include/javascript/sugar_field_grp.js' => '339b3b1d92f554dbac7fad410360c8f1',
+  './cache/include/javascript/sugar_grp1_jquery.js' => '49498e5d14244f125e6bcadbd6e1ea7d',
+  './cache/include/javascript/sugar_grp1.js' => '86000e841ececb074db1f967a31f559b',
   './cache/layout/index.html' => '9cd784063d39b18d308932c28c385853',
   './cache/images/index.html' => '9cd784063d39b18d308932c28c385853',
   './cache/xml/index.html' => '9cd784063d39b18d308932c28c385853',
@@ -5305,7 +5310,7 @@ $md5_string = array (
   './metadata/queues_beansMetaData.php' => '7ed700945b7e4f1514ca50e277edce62',
   './metadata/inboundEmail_cacheTimestampMetaData.php' => '173cef12f6159213810d3d1aba3fcbe9',
   './metadata/project_productsMetaData.php' => 'd8f2436d5209beba508c3257416da5e6',
-  './metadata/audit_templateMetaData.php' => 'fbfeca1f50a9dbad45685501e1ee93ec',
+  './metadata/audit_templateMetaData.php' => '49fffe2dc4299d09d9ca14ae34525a80',
   './metadata/oauth_nonce.php' => '86e3ade134d30c107e1a312ab9a01b2f',
   './metadata/documents_accountsMetaData.php' => '9febf8e894983057f72f6118fa3d3e4a',
   './metadata/configMetaData.php' => '47228108824588a66ae8c82b5d7afaa4',
@@ -5319,7 +5324,7 @@ $md5_string = array (
   './metadata/prospect_lists_prospectsMetaData.php' => 'fe3dc7d813428ca0fa774884a88ef5c4',
   './metadata/inboundEmail_autoreplyMetaData.php' => '7c670a62c7142827bbdf675c8b4be221',
   './metadata/acl_roles_actionsMetaData.php' => 'a3446107943a271bf6e329a80deb06e8',
-  './sugar_version.php' => 'b1fe2c51e01faab34d40d17e8367b9a3',
+  './sugar_version.php' => '572db8864c136e6bc24499477089d108',
   './cron.php' => '96a6fd7893809132e902086e77dde30c',
   './log4php/LoggerManager.php' => 'fa34194306cd50c01b71d8d5060ee362',
   './TreeData.php' => '7040af43bf01c450f4e225ece5e3f30c',
@@ -6520,7 +6525,7 @@ $md5_string = array (
   './themes/Sugar5/images/select.gif' => '2090e9761478fb6bee48c197b0f102dc',
   './themes/Sugar5/images/arrow_down.gif' => '7ae60aa70170713428e265b1cc695291',
   './themes/Sugar5/themedef.php' => '79f66d3ad564f057ab233f595c84f28c',
-  './themes/Sugar5/css/style.css' => 'e014940f603757acf199fdca025a259d',
+  './themes/Sugar5/css/style.css' => '62ae2e32940ecfb5ff90442905e93ad9',
   './themes/Sugar5/css/chart.css' => '78bf9d159067f20c5e3fc6adf7762f1c',
   './themes/Sugar5/css/print.css' => 'c00fb2d3011318e43c4b1332080d1698',
   './themes/Sugar5/css/yui.css' => '45d099cc32f4ea1cf99817b9374e0566',
@@ -6541,7 +6546,7 @@ $md5_string = array (
   './jssource/src_files/modules/Administration/javascript/Async.js' => 'd0e7a85e67bde67980dad376c11f1221',
   './jssource/src_files/modules/Administration/javascript/Administration.js' => '8c7eb2c4bd0024ab3f020d84c58ef1d5',
   './jssource/src_files/modules/Meetings/jsclass_scheduler.js' => '38fd2043bdc095d22960685a08729dab',
-  './jssource/src_files/modules/Meetings/duration_dependency.js' => '2aebc3441fea5a5b85f4c2bf2a08946c',
+  './jssource/src_files/modules/Meetings/duration_dependency.js' => '59bac762067bf2baa5fa6d52824d0338',
   './jssource/src_files/modules/Project/Project.js' => '935ffab1d5effc64a12e43c5ed8f243d',
   './jssource/src_files/modules/Contacts/Contact.js' => '57e5e967dd1d1f623d4248922115f258',
   './jssource/src_files/modules/Campaigns/WebToLead.js' => '8bfdb04c8a3aa1354c1eecfdee8b066b',
@@ -6566,14 +6571,14 @@ $md5_string = array (
   './jssource/src_files/modules/EAPM/EAPMEdit.js' => '127511d0f21897d3424692d2fa3b7b3f',
   './jssource/src_files/modules/Schedulers/Schedulers.js' => '60e06fbc7695f413cc76aef1f2c393ff',
   './jssource/src_files/modules/ACLRoles/ACLRoles.js' => 'a4e950601a92d86219b5b2c00c41fd74',
-  './jssource/src_files/modules/Calendar/Cal.js' => 'a7d651d31e7f07b66cc01a1e4fdce8a8',
+  './jssource/src_files/modules/Calendar/Cal.js' => '7fa9105922a341193356923f36d71c08',
   './jssource/src_files/modules/Documents/documents.js' => 'b15b9c6f9ec7ea2bc2ad3dbfb5de46bd',
   './jssource/src_files/modules/Leads/Lead.js' => 'c81abe209fd0eb0b07fe03e822181221',
   './jssource/src_files/modules/EmailTemplates/EmailTemplate.js' => '3ba07abfef8bbfbba604ed19ebd52fd0',
   './jssource/src_files/service/utils/SugarRest.js' => '25bb6ba045022c695e3b3582f4a00ce6',
   './jssource/src_files/include/MySugar/javascript/MySugar.js' => '33dea628a26df11e8d89eb78f4684db4',
   './jssource/src_files/include/SugarEmailAddress/SugarEmailAddress.js' => '45cf765b2ff9dfe06a975df8464c615b',
-  './jssource/src_files/include/javascript/ajaxUI.js' => '79a5a52b3e84e90b33d2238a312508a7',
+  './jssource/src_files/include/javascript/ajaxUI.js' => '47b2ebed0ecf6c97c8c676fa578a176d',
   './jssource/src_files/include/javascript/calendar.js' => '8a64349697d88a99b897514e60afcb4d',
   './jssource/src_files/include/javascript/iscroll.js' => 'b6c232e3c54b2a1320b22c7ad920c842',
   './jssource/src_files/include/javascript/include.js' => 'b120bd1c521be781c2dee60e719fb15d',
@@ -7349,11 +7354,11 @@ $md5_string = array (
   './jssource/src_files/include/javascript/sugar_yui_overrides.js' => 'ac6afa48c7c53dd7a52fc0e812c54d4f',
   './jssource/src_files/include/javascript/cookie.js' => 'c4e6168195f22c5fbb1780a0745bde24',
   './jssource/src_files/include/javascript/popup_parent_helper.js' => 'c546e26584026b47054eecbcba234410',
-  './jssource/src_files/include/javascript/sugar_3.js' => '81fc5329cc10914bb644b543c1151e21',
+  './jssource/src_files/include/javascript/sugar_3.js' => 'f0b9d30c421eca4a9d8772c607351118',
   './jssource/src_files/include/javascript/jquery.js' => '219073097031d9c1a95a1291d66f3a10',
   './jssource/src_files/include/javascript/sugar_connection_event_listener.js' => 'e38a0e0155991cbc8fabaa59bcb1b705',
-  './jssource/src_files/include/javascript/jsclass_async.js' => '95072f5177e01c78662f14596255402e',
-  './jssource/src_files/include/javascript/quickCompose.js' => 'b2db33320779d3126dbe9ba253006da7',
+  './jssource/src_files/include/javascript/jsclass_async.js' => '9f9bb812b962be782121ec32cc68fe36',
+  './jssource/src_files/include/javascript/quickCompose.js' => '11a2d042c773ecec8afd0a26137265c7',
   './jssource/src_files/include/javascript/menu.js' => 'd5b3b0de4b7cd4c2c10eef2e5f2977a7',
   './jssource/src_files/include/javascript/sugarwidgets/SugarYUILoader.js' => '083ca4051ecfd7eab9d6af2ddb36631a',
   './jssource/src_files/include/javascript/sugarwidgets/SugarYUIWidgets.js' => 'a193587d4730e306026088f7af523186',
@@ -7374,21 +7379,21 @@ $md5_string = array (
   './jssource/src_files/include/connectors/formatters/default/company_detail.js' => '4df2a6df9d9a5e704d6fb6d0ce99ea04',
   './jssource/src_files/include/SugarCharts/Jit/FlashCanvas/flashcanvas.js' => '60e9df067b6a0591aedbfd15f2a6d21b',
   './jssource/src_files/include/SugarCharts/Jit/FlashCanvas/canvas2png.js' => '4c95a8c2071e0d5b4ae1531a790f1492',
-  './jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js' => '179ff69cbded37be073695f28e5fd06b',
+  './jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js' => '96960358d66fbc0499c8a22cdd93775d',
   './jssource/src_files/include/SugarCharts/Jit/js/mySugarCharts.js' => 'df95d66e1bc6a83e23224bcf9a2c7355',
   './jssource/src_files/include/SugarCharts/Jit/js/Jit/jit.js' => '88df69bdc4b1619a0da7cf0df8c841eb',
   './jssource/src_files/include/SugarFields/Fields/File/SugarFieldFile.js' => '103bcede04c3e18e7ebf1df5a68fa3c4',
   './jssource/src_files/include/SugarFields/Fields/Address/SugarFieldAddress.js' => '0f97d6009e2d91ea00eb18b788e04ae0',
   './jssource/src_files/include/SugarFields/Fields/Collection/SugarFieldCollection.js' => 'c3b0f7249b491eafd0a09aaa2caceea5',
   './jssource/src_files/include/SugarFields/Fields/Time/Time.js' => 'e3ce55d6cf0f0e0a6ad6ab9edb3456e3',
-  './jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => '2f7e2873d8415eb6c33a3858b98f8960',
-  './jssource/src_files/include/SubPanel/SubPanelTiles.js' => '9c69c384ddc74291f0989cfec59bd1fa',
+  './jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js' => 'd98b2a1cd2cf9c9b6739015f98b1a9d4',
+  './jssource/src_files/include/SubPanel/SubPanelTiles.js' => '5744614fd3975ef20e3d876211d174ff',
   './jssource/src_files/include/HTMLPurifier/standalone/HTMLPurifier/Printer/ConfigForm.js' => 'ee5990d6bb62017463a7a8d72c8288b5',
   './jssource/minify.php' => '0af28efb7b3fb17907385d14b30672a3',
   './jssource/minify_utils.php' => 'f8041fdf57fcd09505abcb86e7f2f7b4',
   './jssource/jsmin.php' => 'a829ac7a2fb59907c67e8c7b5eb7ef50',
   './jssource/Minifier.php' => '715c5d44e0fc304857e1f466fc20533e',
-  './jssource/JSGroupings.php' => 'dc2ca3b3cb026b2275637fffaea185e8',
+  './jssource/JSGroupings.php' => '226f05d0c0dcdc69ec23fa1494ed4776',
   './crossdomain.xml' => '6922829b24bd53b718b25bb5066664df',
   './upload/index.html' => '330a1eedb7f47535b37c1159ef805ec1',
   './acceptDecline.php' => '85460f31e0ebcc776ee1d15087b10e1a',
@@ -7402,7 +7407,7 @@ $md5_string = array (
   './install/installDisabled.php' => '109a830700ae4da30dfe773abb1ca84d',
   './install/performSetup.php' => '77b700aafa8787d254bef9512ef1ce4d',
   './install/install_defaults.php' => '8fdb4b9eacb7b264339875c327cc6694',
-  './install/install_utils.php' => 'c1083a390157c8496404abe1ddbe5851',
+  './install/install_utils.php' => '70e8cd44bc5535ad2d0e256ca8052172',
   './install/UserDemoData.php' => '3cd1325c661876c7b8164bb9a38a137c',
   './install/demoData.en_us.php' => '7357ecb854d7a6ef69c64228a27f2804',
   './install/UploadLangFileCheck.php' => '9011e63c597c34b77a100de2c4b941d7',
@@ -7418,31 +7423,31 @@ $md5_string = array (
   './install/download_patches.php' => 'df7b3c98416a918dc3d9037e3c0fb15c',
   './install/installHelp.php' => '2a0effc990dad02a1dc5eb7edf08bdaf',
   './install/dbConfig_a.php' => 'f9e41dc56b72131dab05bea54ef563f5',
-  './install/confirmSettings.php' => '006972aecea4b1b1eb82e17c3d4502b1',
+  './install/confirmSettings.php' => '3fbd3d6d62084383ac32f7c986cff7c1',
   './install/checkDBSettings.php' => '5b67fcb8ab009d0d64f13529171898ae',
   './install/installSystemCheck.php' => '102e9133c3a6e068e78d1f0c8a78e99d',
   './install/register.php' => 'e330b29cb54c42d55a0cc8d9a433c9b0',
   './install/TeamDemoData.php' => 'c68371a9b0a56c01295eefe7c7e24f72',
-  './install/language/en_us.lang.php' => '73d2f60bf860f080f105d71e907a8a3a',
+  './install/language/en_us.lang.php' => '1ede5390d19632885f6fb19031137ff9',
   './install/seed_data/quotes_SeedData.php' => 'ec21dd960d685aab758ff501b31bd4fd',
   './install/seed_data/Advanced_Password_SeedData.php' => '6570caa9b6f9802427211ddb3f9f5066',
   './install/licensePrint.php' => 'd574f1f71eeaf3dc4be9e12f3d5b43e9',
   './install/license.php' => '00d8b0f04104eaa3cab95f1d1b26fb33',
   './install/installType.php' => 'f5b3025e3996ad16b8218d3b1424e389',
   './install/download_modules.php' => 'a1625e32936a669709b617a609c5a7ba',
-  './download.php' => 'f07780b763a7e8581b1a8658bb4ac696',
+  './download.php' => 'cdc2271aff5d9893e95168501eac0d31',
   './campaign_trackerv2.php' => 'd474548736ceaf4275064094e5aa798b',
   './install.php' => 'a4e2e1c845b63962dfa89cd8ff50c9f7',
   './soap/SoapDeprecated.php' => '309e512eb7592c910a824f991869c4b4',
   './soap/SoapError.php' => 'dff0c6fc02f66fbb4f86a91691ee300e',
   './soap/SoapHelperFunctions.php' => '6c048484d622dabb8591c5ff02a6e420',
-  './soap/SoapPortalHelper.php' => '26539662f745829c3ad798995ccb0969',
-  './soap/SoapSugarUsers.php' => '1a4302d16978eb5d392bde44103ee530',
+  './soap/SoapPortalHelper.php' => '302d5e90cf56d708b6d3f087fec2e72f',
+  './soap/SoapSugarUsers.php' => '139d0b860d8efdae004c89c28417e96c',
   './soap/SoapStudio.php' => '0fd81758942a52940c119f3afa134fcd',
   './soap/SoapRelationshipHelper.php' => '03cfb58253ac766d90ddf57d38d36afe',
   './soap/SoapErrorDefinitions.php' => '0ba2c58cdbdaec479860537420e4cf30',
   './soap/SoapTypes.php' => '6dd557894d504db5527eceb5dab0a26f',
-  './soap/SoapPortalUsers.php' => '042268bfdc548309f09f8862c51788ea',
+  './soap/SoapPortalUsers.php' => '2711b2d223ef4d770fdbc3d12791a733',
   './soap/SoapData.php' => '2f2d03d74a72f8c9c769705b3b385251',
 );
 ?>
diff --git a/include/EditView/EditView2.php b/include/EditView/EditView2.php
index 23364901..1c7de96b 100644
--- a/include/EditView/EditView2.php
+++ b/include/EditView/EditView2.php
@@ -459,6 +459,10 @@ class EditView
                    }
                 }
 
+                if(isset($this->fieldDefs[$name]['options']) && is_array($this->fieldDefs[$name]['options']) && isset($this->fieldDefs[$name]['default_empty']) && !isset($this->fieldDefs[$name]['options'][$this->fieldDefs[$name]['default_empty']])) {
+                    $this->fieldDefs[$name]['options'] = array_merge(array($this->fieldDefs[$name]['default_empty']=>$this->fieldDefs[$name]['default_empty']), $this->fieldDefs[$name]['options']);
+                }
+                                
 	       	 	if(isset($this->fieldDefs[$name]['function'])) {
 	       	 		$function = $this->fieldDefs[$name]['function'];
 	       			if(is_array($function) && isset($function['name'])){
diff --git a/include/EditView/SubpanelQuickCreate.php b/include/EditView/SubpanelQuickCreate.php
index 993549f0..50609596 100644
--- a/include/EditView/SubpanelQuickCreate.php
+++ b/include/EditView/SubpanelQuickCreate.php
@@ -41,12 +41,26 @@ require_once('include/EditView/EditView2.php');
  * @api
  */
 class SubpanelQuickCreate{
-	var $defaultProcess = true;
+    public $defaultProcess = true;
+
+    /**
+     * The view type to use
+     *
+     * @var string
+     */
+    public $viewType = 'QuickCreate';
 
     public function SubpanelQuickCreate($module, $view='QuickCreate', $proccessOverride = false)
     {
+        $this->viewType = $view;
+
         //treat quickedit and quickcreate views as the same
-        if($view == 'QuickEdit') {$view = 'QuickCreate';}
+        if($this->viewType == 'QuickEdit') {
+            $this->viewType = 'QuickCreate';
+        }
+
+        // Get the viewdefs source file, called here to ensure proper viewType setting
+        $source = $this->getModuleViewDefsSourceFile($module, $this->viewType);
 
 		// locate the best viewdefs to use: 1. custom/module/quickcreatedefs.php 2. module/quickcreatedefs.php 3. custom/module/editviewdefs.php 4. module/editviewdefs.php
 		$base = 'modules/' . $module . '/metadata/';
@@ -67,7 +81,7 @@ class SubpanelQuickCreate{
 		}
 
         $this->ev = $this->getEditView();
-		$this->ev->view = $view;
+		$this->ev->view = $this->viewType;
 		$this->ev->ss = new Sugar_Smarty();
 		//$_REQUEST['return_action'] = 'SubPanelViewer';
 
@@ -81,7 +95,7 @@ class SubpanelQuickCreate{
 
 
 		// Bug 49219 - Check empty before set defaults, or the settings from viewdefs above will be overridden.
-		if (!isset($this->ev->defs['templateMeta']['form']['headerTpl']))
+        if (!isset($this->ev->defs['templateMeta']['form']['headerTpl']))
         {
             $this->ev->defs['templateMeta']['form']['headerTpl'] = 'include/EditView/header.tpl';
         }
@@ -142,6 +156,9 @@ class SubpanelQuickCreate{
 	}
 
 	function process($module){
+        if($_REQUEST['target_action'] == 'QuickCreate'){
+            $this->ev->view = 'QuickCreate';
+        }
         $form_name = 'form_Subpanel'.$this->ev->view .'_'.$module;
         $this->ev->formName = $form_name;
         $this->ev->process(true, $form_name);
@@ -156,4 +173,34 @@ class SubpanelQuickCreate{
     {
         return new EditView();
     }
+
+
+    /**
+     * Finds and returns the best viewdefs to use:
+     *  1. custom/module/quickcreatedefs.php
+     *  2. module/quickcreatedefs.php
+     *  3. custom/module/editviewdefs.php
+     *  4. module/editviewdefs.php
+     *
+     * @param $module
+     * @param $view
+     * @return string The path to the viewdefs file to use
+     */
+    public function getModuleViewDefsSourceFile($module, $view) {
+        $base = 'modules/' . $module . '/metadata/';
+		$source = 'custom/' . $base . strtolower($view) . 'defs.php';
+		if (!file_exists($source)) {
+			$source = $base . strtolower($view) . 'defs.php';
+			if (!file_exists($source)) {
+				//if our view does not exist default to EditView
+				$this->viewType = 'EditView';
+				$source = 'custom/' . $base . 'editviewdefs.php';
+				if (!file_exists($source)) {
+					$source = $base . 'editviewdefs.php';
+				}
+			}
+		}
+
+        return $source;
+    }
 }
diff --git a/include/ListView/ListView.php b/include/ListView/ListView.php
index fa03cd45..a7be274b 100644
--- a/include/ListView/ListView.php
+++ b/include/ListView/ListView.php
@@ -370,6 +370,10 @@ function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
         static $count;
         if(!isset($count))$count = 0;
 
+        $field_acl['DetailView'] = $aItem->ACLAccess('DetailView');
+        $field_acl['ListView'] = $aItem->ACLAccess('ListView');
+        $field_acl['EditView'] = $aItem->ACLAccess('EditView');
+        $field_acl['Delete'] = $aItem->ACLAccess('Delete');
         foreach($thepanel->get_list_fields() as $field_name=>$list_field)
         {
             //add linked field attribute to the array.
@@ -399,10 +403,7 @@ function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
                 $list_field['start_link_wrapper'] = $this->start_link_wrapper;
                 $list_field['end_link_wrapper'] = $this->end_link_wrapper;
                 $list_field['subpanel_id'] = $this->subpanel_id;
-                $list_field['DetailView'] = $aItem->ACLAccess('DetailView');
-                $list_field['ListView'] = $aItem->ACLAccess('ListView');
-                $list_field['EditView'] = $aItem->ACLAccess('EditView');
-                $list_field['Delete'] = $aItem->ACLAccess('Delete');
+                $list_field += $field_acl;
                 if ( isset($aItem->field_defs[strtolower($list_field['name'])])) {
                     require_once('include/SugarFields/SugarFieldHandler.php');
                     // We need to see if a sugar field exists for this field type first,
@@ -431,6 +432,12 @@ function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
                         if('full_name' == $field_name){//bug #32465
                            $list_field['fields'][strtoupper($field_name)] = $widget_contents;
                         }
+
+                        //vardef source is non db, assign the field name to varname for processing of column.
+                        if(!empty($vardef['source']) && $vardef['source']=='non-db'){
+                            $list_field['varname'] = $field_name;
+
+                        }
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
                     } else if(isset($list_field['widget_class']) && $list_field['widget_class'] == 'SubPanelEmailLink' ) {
                         $widget_contents = $layout_manager->widgetDisplay($list_field);
@@ -482,7 +489,7 @@ function process_dynamic_listview($source_module, $sugarbean,$subpanel_def)
                 'id' => $tempid,
                 'buttons' => $button_contents,
                 'class' => 'clickMenu subpanel records fancymenu button',
-                'theme' => 'Sugar' //assign theme value to display dropdown menu on class theme
+                'flat' => false //assign flat value as false to display dropdown menu at any other preferences.
             ), $this->xTemplate);
             $this->xTemplate->assign('CLASS', "inlineButtons");
             $this->xTemplate->assign('CELL_COUNT', ++$count);
@@ -588,12 +595,6 @@ function getOrderBy($varName, $defaultOrderBy='', $force_sortorder='') {
     } else {
         $this->setUserVariable($varName, "ORDER_BY", $sortBy);
     }
-    if($sortBy == 'amount') {
-        $sortBy = 'amount*1';
-    }
-    if($sortBy == 'amount_usdollar') {
-        $sortBy = 'amount_usdollar*1';
-    }
 
     $desc = $this->getSessionVariable($varName, $sortBy."S");
 
@@ -1307,7 +1308,8 @@ $close_inline_img = SugarThemeRegistry::current()->getImage('close_inline', 'bor
                 $select_link = smarty_function_sugar_action_menu(array(
                     'class' => 'clickMenu selectmenu',
                     'id' => 'selectLink',
-                    'buttons' => $menuItems
+                    'buttons' => $menuItems,
+                    'flat' => false,
                 ),$this->xTemplate);
 
             } else {
@@ -1913,11 +1915,11 @@ $close_inline_img = SugarThemeRegistry::current()->getImage('close_inline', 'bor
 		/**
 		 * @deprecated only used by legacy opportunites listview, nothing current. Leaving for BC
 		 */
-		if($orderBy == 'amount*1')
+		if($orderBy == 'amount')
 		{
 			$this->xTemplateAssign('amount_arrow', $imgArrow);
 		}
-		else if($orderBy == 'amount_usdollar*1')
+		else if($orderBy == 'amount_usdollar')
 		{
 			$this->xTemplateAssign('amount_usdollar_arrow', $imgArrow);
 		}
diff --git a/include/ListView/ListViewData.php b/include/ListView/ListViewData.php
index 102035c0..d8acba57 100644
--- a/include/ListView/ListViewData.php
+++ b/include/ListView/ListViewData.php
@@ -420,6 +420,9 @@ class ListViewData {
 
 			    $temp->setupCustomFields($temp->module_dir);
 				$temp->loadFromRow($row);
+				if (empty($this->seed->assigned_user_id) && !empty($temp->assigned_user_id)) {
+				    $this->seed->assigned_user_id = $temp->assigned_user_id;
+				}
 				if($idIndex[$row[$id_field]][0] == $dataIndex){
 				    $pageData['tag'][$dataIndex] = $temp->listviewACLHelper();
 				}else{
diff --git a/include/ListView/ListViewDisplay.php b/include/ListView/ListViewDisplay.php
index ae483e72..782db516 100644
--- a/include/ListView/ListViewDisplay.php
+++ b/include/ListView/ListViewDisplay.php
@@ -298,7 +298,8 @@ class ListViewDisplay {
         $link = array(
             'class' => 'clickMenu selectmenu',
             'id' => 'selectLink',
-            'buttons' => $menuItems
+            'buttons' => $menuItems,
+            'flat' => false,
         );
         return $link;
 	}
@@ -346,7 +347,8 @@ class ListViewDisplay {
             'class' => 'clickMenu selectActions fancymenu',
             'id' => 'selectActions',
             'name' => 'selectActions',
-            'buttons' => $menuItems
+            'buttons' => $menuItems,
+            'flat' => false,
         );
         return $link;
 
diff --git a/include/ListView/ListViewPagination.tpl b/include/ListView/ListViewPagination.tpl
index 6f85bc72..91be1ef9 100644
--- a/include/ListView/ListViewPagination.tpl
+++ b/include/ListView/ListViewPagination.tpl
@@ -52,11 +52,11 @@
 					<td nowrap="nowrap" width='2%' class='paginationActionButtons'>
 						{if $prerow}
 
-                        {sugar_action_menu id=$link_select_id params=$selectLink theme="Sugar"}
+                        {sugar_action_menu id=$link_select_id params=$selectLink}
 					
 						{/if}
 
-						{sugar_action_menu id=$link_action_id params=$actionsLink theme="Sugar"}
+						{sugar_action_menu id=$link_action_id params=$actionsLink}
 
                         { if $actionDisabledLink ne "" }<div class='selectActionsDisabled' id='select_actions_disabled_{$action_menu_location}'>{$actionDisabledLink}<span class='ab'></span></div>{/if}
 						&nbsp;{$selectedObjectsSpan}		
diff --git a/include/MVC/SugarApplication.php b/include/MVC/SugarApplication.php
index 8dab94b4..62486f7c 100644
--- a/include/MVC/SugarApplication.php
+++ b/include/MVC/SugarApplication.php
@@ -98,7 +98,7 @@ class SugarApplication
 		// Double check the server's unique key is in the session.  Make sure this is not an attempt to hijack a session
 		$user_unique_key = (isset($_SESSION['unique_key'])) ? $_SESSION['unique_key'] : '';
 		$server_unique_key = (isset($sugar_config['unique_key'])) ? $sugar_config['unique_key'] : '';
-		$allowed_actions = (!empty($this->controller->allowed_actions)) ? $this->controller->allowed_actions : $allowed_actions = array('Authenticate', 'Login',);
+		$allowed_actions = (!empty($this->controller->allowed_actions)) ? $this->controller->allowed_actions : $allowed_actions = array('Authenticate', 'Login', 'LoggedOut');
 
 		if(($user_unique_key != $server_unique_key) && (!in_array($this->controller->action, $allowed_actions)) &&
 		   (!isset($_SESSION['login_error'])))
@@ -712,6 +712,9 @@ class SugarApplication
         if(isset($_REQUEST['mobile'])) {
             $ret['mobile'] = $_REQUEST['mobile'];
         }
+        if(isset($_REQUEST['no_saml'])) {
+            $ret['no_saml'] = $_REQUEST['no_saml'];
+        }
         if(empty($ret)) return '';
         return "&".http_build_query($ret);
 	}
diff --git a/include/MVC/View/SugarView.php b/include/MVC/View/SugarView.php
index 120c8b3e..b6e3bed8 100644
--- a/include/MVC/View/SugarView.php
+++ b/include/MVC/View/SugarView.php
@@ -1350,9 +1350,9 @@ EOHTML;
         if (isset($this->action)){
             switch ($this->action) {
             case 'EditView':
-                if(!empty($this->bean->id)) {
-                    $params[] = $this->bean->get_summary_text();
-                    //$params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
+                if(!empty($this->bean->id) && (empty($_REQUEST['isDuplicate']) || $_REQUEST['isDuplicate'] === 'false')) {
+                    $params[] = "<a href='index.php?module={$this->module}&action=DetailView&record={$this->bean->id}'>".$this->bean->get_summary_text()."</a>";
+                    $params[] = $GLOBALS['app_strings']['LBL_EDIT_BUTTON_LABEL'];
                 }
                 else
                     $params[] = $GLOBALS['app_strings']['LBL_CREATE_BUTTON_LABEL'];
@@ -1486,7 +1486,7 @@ EOHTML;
         {
             foreach ($sugar_config['js_available'] as $configKey)
             {
-                if (isset($sugar_config[$configKey])) 
+                if (isset($sugar_config[$configKey]))
                 {
                     $jsVariableStatement = $this->prepareConfigVarForJs($configKey, $sugar_config[$configKey]);
                     if (!array_search($jsVariableStatement, $config_js))
diff --git a/include/MVC/View/views/view.detail.php b/include/MVC/View/views/view.detail.php
index d1ba4af2..fcdd4683 100644
--- a/include/MVC/View/views/view.detail.php
+++ b/include/MVC/View/views/view.detail.php
@@ -72,7 +72,7 @@ class ViewDetail extends SugarView
  	    $metadataFile = $this->getMetaDataFile();
  	    $this->dv = new DetailView2();
  	    $this->dv->ss =&  $this->ss;
- 	    $this->dv->setup($this->module, $this->bean, $metadataFile, 'include/DetailView/DetailView.tpl'); 		
+ 	    $this->dv->setup($this->module, $this->bean, $metadataFile, get_custom_file_if_exists('include/DetailView/DetailView.tpl'));
     } 	
  	
     /**
diff --git a/include/MVC/View/views/view.edit.php b/include/MVC/View/views/view.edit.php
index b60ede61..cb1959ee 100644
--- a/include/MVC/View/views/view.edit.php
+++ b/include/MVC/View/views/view.edit.php
@@ -61,7 +61,7 @@ require_once('include/EditView/EditView2.php');
         $metadataFile = $this->getMetaDataFile();
         $this->ev = $this->getEditView();
         $this->ev->ss =& $this->ss;
-        $this->ev->setup($this->module, $this->bean, $metadataFile, 'include/EditView/EditView.tpl');
+        $this->ev->setup($this->module, $this->bean, $metadataFile, get_custom_file_if_exists('include/EditView/EditView.tpl'));
     }
 
  	function display(){
diff --git a/include/MVC/View/views/view.list.php b/include/MVC/View/views/view.list.php
index f594cd31..df6f605e 100644
--- a/include/MVC/View/views/view.list.php
+++ b/include/MVC/View/views/view.list.php
@@ -215,7 +215,7 @@ class ViewList extends SugarView{
 
             $searchMetaData = SearchForm::retrieveSearchDefs($this->module);
 
-            $this->searchForm = new SearchForm($this->seed, $this->module, $this->action);
+            $this->searchForm = $this->getSearchForm2($this->seed, $this->module, $this->action);
             $this->searchForm->setup($searchMetaData['searchdefs'], $searchMetaData['searchFields'], 'SearchFormGeneric.tpl', $view, $this->listViewDefs);
             $this->searchForm->lv = $this->lv;
         }
@@ -266,5 +266,16 @@ class ViewList extends SugarView{
             $this->listViewProcess();
         }
     }
+
+      /**
+       *
+       * @return SearchForm
+       */
+    protected function getSearchForm2($seed, $module, $action = "index")
+    {
+        // SearchForm2.php is required_onced above before calling this function
+        // hence the order of parameters is different from SearchForm.php
+        return new SearchForm($seed, $module, $action);
+    }
 }
 ?>
diff --git a/include/MVC/View/views/view.popup.php b/include/MVC/View/views/view.popup.php
index 04f67c0b..9634d554 100644
--- a/include/MVC/View/views/view.popup.php
+++ b/include/MVC/View/views/view.popup.php
@@ -98,7 +98,15 @@ class ViewPopup extends SugarView{
                 foreach($current_query_by_page as $search_key=>$search_value) {
                     if($search_key != $this->module.'2_'.strtoupper($this->bean->object_name).'_offset'
                     	&& !in_array($search_key, $blockVariables)) {
-						$_REQUEST[$search_key] = $GLOBALS['db']->quote($search_value);
+                        if (!is_array($search_value)) {
+                            $_REQUEST[$search_key] = $GLOBALS['db']->quote($search_value);
+                        }
+                        else {
+                            foreach ($search_value as $key=>&$val) {
+                                $val = $GLOBALS['db']->quote($val);
+                            }
+                            $_REQUEST[$search_key] = $search_value;
+                        }
                     }
                 }
             }
diff --git a/include/Popups/tpls/PopupGeneric.tpl b/include/Popups/tpls/PopupGeneric.tpl
index 425296c7..e1af73d8 100644
--- a/include/Popups/tpls/PopupGeneric.tpl
+++ b/include/Popups/tpls/PopupGeneric.tpl
@@ -110,7 +110,7 @@
 			{if $prerow}
 				<td nowrap="nowrap" width="43px" class="selectCol td_alt">
 				<div style="width:43px">
-					{sugar_action_menu id=$link_select_id params=$selectLink theme="Sugar"}
+					{sugar_action_menu id=$link_select_id params=$selectLink}
 				</div>
 				</td>
 				<td class='td_alt' nowrap="nowrap" width='1%'>&nbsp;</td>
diff --git a/include/SearchForm/SearchForm.php b/include/SearchForm/SearchForm.php
index c1e4e6b2..ce8bd70a 100644
--- a/include/SearchForm/SearchForm.php
+++ b/include/SearchForm/SearchForm.php
@@ -98,10 +98,12 @@ class SearchForm {
         //require_once('modules/' . $module . '/metadata/SearchFields.php');
         $this->searchFields = $searchFields[$module];
         if(empty($tpl)) {
-            $this->tpl = 'modules/' . $module . '/SearchForm.html';
             if(!empty($GLOBALS['layout_edit_mode'])){
             	 $this->tpl = sugar_cached('studio/custom/working/modules/' . $module . '/SearchForm.html');
             }
+            else {
+             	 $this->tpl = get_custom_file_if_exists('modules/' . $module . '/SearchForm.html');
+            }
         }
         else {
             $this->tpl = $tpl;
diff --git a/include/SearchForm/SearchForm2.php b/include/SearchForm/SearchForm2.php
index d621ac9c..a103c306 100644
--- a/include/SearchForm/SearchForm2.php
+++ b/include/SearchForm/SearchForm2.php
@@ -109,11 +109,11 @@ require_once('include/EditView/EditView2.php');
  		$this->view = $this->view.'_'.$displayView;
  		$tokens = explode('_', $this->displayView);
  		$this->parsedView = $tokens[0];
+                $this->searchFields = $searchFields[$this->module];
  		if($this->displayView != 'saved_views'){
  			$this->_build_field_defs();
  		}
 
-        $this->searchFields = $searchFields[$this->module];
 
         // Setup the tab array.
         $this->tabs = array();
@@ -402,7 +402,8 @@ require_once('include/EditView/EditView2.php');
 	                // fill in enums
                     $this->fieldDefs[$fvName]['options'] = $GLOBALS['app_list_strings'][$this->fieldDefs[$fvName]['options']];
                     //Hack to add blanks for parent types on search views
-                    if ($this->fieldDefs[$fvName]['type'] == "parent_type" || $this->fieldDefs[$fvName]['type'] == "parent")
+                    //53131 - add blank option for SearchField options with def 'options_add_blank' set to true
+                    if ($this->fieldDefs[$fvName]['type'] == "parent_type" || $this->fieldDefs[$fvName]['type'] == "parent" || (isset($this->searchFields[$name]['options_add_blank']) && $this->searchFields[$name]['options_add_blank']) )
                     {
                         $this->fieldDefs[$fvName]['options'] = array_merge(array(""=>""), $this->fieldDefs[$fvName]['options']);
                     }
@@ -1020,15 +1021,21 @@ require_once('include/EditView/EditView2.php');
                                      //check to see if this is a universal search OR the field has db_concat_fields set in vardefs, AND the field name is "last_name"
                                      //BUG 45709: Tasks Advanced Search: Contact Name field does not return matches on full names
                                      //Frank: Adding Surabhi's fix back which seem to have gone missing in CottonCandy merge
-                                     if(($UnifiedSearch || !empty($this->seed->field_name_map[$field]['db_concat_fields'])) && strpos($db_field, 'last_name') !== false){
+                                     if(($UnifiedSearch || !empty($this->seed->field_name_map[$field]['db_concat_fields'])) && (strpos($db_field, 'last_name') !== false) || strpos($db_field, 'name_2') !== false){
                                          //split the string value, and the db field name
                                          $string = explode(' ', $field_value);
                                          $column_name =  explode('.', $db_field);
                                          //when a search is done with a space, we concatenate and search against the full name.
                                          if(count($string)>1){
-                                             //add where clause against concatenated fields
-                                             $where .= $this->seed->db->concat($column_name[0],array('first_name','last_name')) . " LIKE ".$this->seed->db->quoted($field_value.'%');
-                                             $where .= ' OR ' . $this->seed->db->concat($column_name[0],array('last_name','first_name')) . " LIKE ".$this->seed->db->quoted($field_value.'%');
+                                             //add where clause against concatenated field
+                                             $first_field = $parms['db_field'][0];
+                                             $second_field = $parms['db_field'][1];
+                                             $first_db_fields = explode('.', $first_field);
+                                             $second_db_fields = explode('.', $second_field);
+                                             if(count($first_db_fields)==2) $first_field = $first_db_fields[1];
+                                             if(count($second_db_fields)==2) $second_field = $second_db_fields[1];
+                                             $where .= $this->seed->db->concat($column_name[0],array($first_field,$second_field)) . " LIKE ".$this->seed->db->quoted($field_value.'%');
+                                             $where .= ' OR ' . $this->seed->db->concat($column_name[0],array($second_field,$first_field)) . " LIKE ".$this->seed->db->quoted($field_value.'%');
                                          }else{
                                              //no space was found, add normal where clause
                                              $where .=  $db_field . " like ".$this->seed->db->quoted(sql_like_string($field_value, $like_char));
diff --git a/include/Smarty/plugins/function.sugar_action_menu.php b/include/Smarty/plugins/function.sugar_action_menu.php
index fb7938fb..17ca47d5 100644
--- a/include/Smarty/plugins/function.sugar_action_menu.php
+++ b/include/Smarty/plugins/function.sugar_action_menu.php
@@ -50,7 +50,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  *     'buttons' => list of button htmls, such as ( html_element1, html_element2, ..., html_element_n),
  *     'id' => id property for ul element
  *     'class' => class property for ul element
- * 	   'flat' => controls the display of the menu as a dropdown or flat buttons
+ * 	   'flat' => controls the display of the menu as a dropdown or flat buttons (if the value is assigned, it will be not affected by enable_action_menu setting.)
  * @param $smarty
  *
  * @return string - compatible sugarActionMenu structure, such as
@@ -117,13 +117,14 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  */
 function smarty_function_sugar_action_menu($params, &$smarty)
 {
-    $flat = !empty($params['flat']) ? $params['flat'] : false;
+    global $sugar_config;
 
     if( !empty($params['params']) ) {
         $addition_params = $params['params'];
         unset($params['params']);
         $params = array_merge_recursive($params, $addition_params);
     }
+    $flat = isset($params['flat']) ? $params['flat'] : (isset($sugar_config['enable_action_menu']) ? !$sugar_config['enable_action_menu'] : false);
     //if buttons have not implemented, it returns empty string;
     if(empty($params['buttons']))
         return '';
@@ -136,10 +137,25 @@ function smarty_function_sugar_action_menu($params, &$smarty)
         );
 
         foreach($params['buttons'] as $item) {
-            if(strlen($item)) {
+            if(is_array($item)) {
+                $sub = array();
+                $sub_first = array_shift($item);
+                foreach($item as $subitem) {
+                    $sub[] = array(
+                        'html' => $subitem
+                    );
+                }
+                array_push($menus['items'],array(
+                    'html' => $sub_first,
+                    'items' => $sub,
+                    'submenuHtmlOptions' => array(
+                        'class' => 'subnav-sub'
+                    )
+                ));
+            } else if(strlen($item)) {
                 array_push($menus['items'],array(
                    'html' => $item
-               ));
+                ));
             }
         }
         $action_menu = array(
@@ -164,12 +180,26 @@ function smarty_function_sugar_action_menu($params, &$smarty)
     }
 
     if (is_array($params['buttons'])) {
-        return '<div class="action_buttons">' . implode(' ', $params['buttons']).'</div>';
+        return '<div class="action_buttons">' . implode_r(' ', $params['buttons'], true).'<div class="clear"></div></div>';
     } else if(is_array($params)) {
-        return '<div class="action_buttons">' . implode(' ', $params).'</div>';
+        return '<div class="action_buttons">' . implode_r(' ', $params, true).'<div class="clear"></div></div>';
     }
 
     return $params['buttons'];
 }
 
+function implode_r($glue, $pieces, $extract_first_item = false) {
+    $result = array_shift($pieces);
+    if(is_array($result)) {
+        $result = implode_r($glue, $result);
+    }
+    foreach($pieces as $item) {
+        if(is_array($item)) {
+            $result .= empty($extract_first_item) ? implode_r($glue, $item) : $glue.$item[0];
+        } else {
+            $result .= $glue.$item;
+        }
+    }
+    return $result;
+}
 ?>
\ No newline at end of file
diff --git a/include/Smarty/plugins/function.sugar_menu.php b/include/Smarty/plugins/function.sugar_menu.php
index 83fe0948..82f530db 100644
--- a/include/Smarty/plugins/function.sugar_menu.php
+++ b/include/Smarty/plugins/function.sugar_menu.php
@@ -107,7 +107,7 @@ function smarty_function_sugar_menu($params, &$smarty)
         if(isset($item['items']) && count($item['items'])) {
             $output .= smarty_function_sugar_menu(array(
                 'items' => $item['items'],
-                'htmlOptions' => !empty($params['submenuHtmlOptions']) ? $params['submenuHtmlOptions'] : array()
+                'htmlOptions' => !empty($params['submenuHtmlOptions']) ? $params['submenuHtmlOptions'] : (!empty($item['submenuHtmlOptions']) ? $item['submenuHtmlOptions'] : array())
             ), $smarty);
         }
         $output .= SugarHtml::createCloseTag("li");
diff --git a/include/Smarty/plugins/function.sugar_number_format.php b/include/Smarty/plugins/function.sugar_number_format.php
index 50c84094..aa3ff73d 100644
--- a/include/Smarty/plugins/function.sugar_number_format.php
+++ b/include/Smarty/plugins/function.sugar_number_format.php
@@ -36,8 +36,8 @@ r53409 - 2010-01-03 19:31:15 -0800 (Sun, 03 Jan 2010) - roger - merge -r50376:HE
  */
 function smarty_function_sugar_number_format($params, &$smarty) {
     global $locale;
-
-	if(!isset($params['var']) || $params['var'] == '') {  
+    
+	if(!isset($params['var']) || $params['var'] === '') {  
         return '';
     } 
 
diff --git a/include/Smarty/plugins/function.sugar_phone.php b/include/Smarty/plugins/function.sugar_phone.php
index 08a9da8d..5ee7fda1 100644
--- a/include/Smarty/plugins/function.sugar_phone.php
+++ b/include/Smarty/plugins/function.sugar_phone.php
@@ -108,7 +108,7 @@ function smarty_function_sugar_phone($params, &$smarty)
     if(isset($system_config->settings['system_skypeout_on']) && $system_config->settings['system_skypeout_on'] == 1
     	&& isset($params['value']) && skype_formatted($params['value'])  ) {
     		$GLOBALS['log']->debug($params['value']);
-			return '<a href="callto://'.format_skype($params['value']).'">'.$params['value'].'</a>';
+			return '<a href="callto:'.format_skype($params['value']).'">'.$params['value'].'</a>';
     } else {
     	return $params['value'];
     }
diff --git a/include/SubPanel/SubPanel.php b/include/SubPanel/SubPanel.php
index 4bfd9bc2..fac3f830 100644
--- a/include/SubPanel/SubPanel.php
+++ b/include/SubPanel/SubPanel.php
@@ -126,7 +126,6 @@ class SubPanel
 		$widget_contents = '<div><table cellpadding="0" cellspacing="0"><tr>';
 		foreach($subpanel_def as $widget_data)
 		{
-			$widget_data['query']=urlencode($panel_query);
 			$widget_data['action'] = $_REQUEST['action'];
 			$widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
 			$widget_data['focus'] = $this->parent_bean;
diff --git a/include/SubPanel/SubPanelDefinitions.php b/include/SubPanel/SubPanelDefinitions.php
index 0edf753e..6b642942 100644
--- a/include/SubPanel/SubPanelDefinitions.php
+++ b/include/SubPanel/SubPanelDefinitions.php
@@ -60,6 +60,16 @@ class aSubPanel
 	var $sub_subpanels ;
 	var $parent_bean ;
 
+    /**
+     * Can we display this subpanel?
+     *
+     * This is set after it loads the def's for the subpanel.  If there are no beans to display in the collection
+     * we don't want to display this as it will just throw errors.
+     *
+     * @var bool
+     */
+    var $canDisplay = true;
+
 	//module's table name and column fields.
 	var $table_name ;
 	var $db_fields ;
@@ -81,9 +91,9 @@ class aSubPanel
 		}
 		$this->mod_strings = $mod_strings ;
 
-		if ($this->isCollection ())
+        if ($this->isCollection ())
 		{
-			$this->load_sub_subpanels () ; //load sub-panel definition.
+			$this->canDisplay = $this->load_sub_subpanels () ; //load sub-panel definition.
 		} else
 		{
 			if (!is_dir('modules/' . $this->_instance_properties [ 'module' ])){
@@ -114,6 +124,7 @@ class aSubPanel
 			if (!$loaded)
 			{
 				$GLOBALS['log']->fatal("Failed to load original or custom subpanel data for $name in $def_path");
+                $this->canDisplay = false;
 			}
 
 			// check that the loaded subpanel definition includes a $subpanel_layout section - some, such as projecttasks/default do not...
@@ -203,7 +214,14 @@ class aSubPanel
 	}
 
 
-	//call this function for sub-panels that have unions.
+    /**
+     * Load the Sub-Panel objects if it can from the metadata files.
+     *
+     * call this function for sub-panels that have unions.
+     *
+     * @return bool         True by default if the subpanel was loaded.  Will return false if none in the collection are
+     *                      allowed by the current user.
+     */
 	function load_sub_subpanels ()
 	{
 
@@ -236,6 +254,8 @@ class aSubPanel
 					$this->sub_subpanels [ $panel ] = new aSubPanel ( $panel, $properties, $this->parent_bean ) ;
 				}
 			}
+            // if it's empty just dump out as there is nothing to process.
+            if(empty($this->sub_subpanels)) return false;
 			//Sync displayed list fields across the subpanels
 			$display_fields = $this->getDisplayFieldsFromCollection($this->sub_subpanels);
 		 	$query_fields = array();
@@ -313,6 +333,8 @@ class aSubPanel
 				$subpanel->panel_definition['list_fields'] = $list_fields;
 			}
 		}
+
+        return true;
 	}
 
 	protected function getDisplayFieldsFromCollection($sub_subpanels)
@@ -361,11 +383,15 @@ class aSubPanel
 		}
 		return true ;
 	}
+
+    /**
+     * Test to see if the sub panels defs contain a collection
+     *
+     * @return bool
+     */
 	function isCollection ()
 	{
-		if ($this->get_inst_prop_value ( 'type' ) == 'collection')
-		return true ; else
-		return false ;
+		return ($this->get_inst_prop_value ( 'type' ) == 'collection');
 	}
 
 	//get value of a property defined at the panel instance level.
@@ -623,12 +649,27 @@ class SubPanelDefinitions
 	 * Load the definition of the a sub-panel.
 	 * Also the sub-panel is added to an array of sub-panels.
 	 * use of reload has been deprecated, since the subpanel is initialized every time.
+     *
+     * @param string $name              The name of the sub-panel to reload
+     * @param boolean $reload           Reload the sub-panel (unused)
+     * @param boolean $original_only    Only load the original sub-panel and no custom ones
+     * @return boolean|aSubPanel        Returns aSubPanel object or boolean false if one is not found or it can't be
+     *      displayed due to ACL reasons.
 	 */
 	function load_subpanel ( $name , $reload = false , $original_only = false )
 	{
 		if (!is_dir('modules/' . $this->layout_defs [ 'subpanel_setup' ][ strtolower ( $name ) ] [ 'module' ]))
 		  return false;
-		return new aSubPanel ( $name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower ( $name ) ], $this->_focus, $reload, $original_only ) ;
+
+        $subpanel = new aSubPanel ( $name, $this->layout_defs [ 'subpanel_setup' ] [ strtolower ( $name ) ], $this->_focus, $reload, $original_only ) ;
+
+        // only return the subpanel object if we can display it.
+        if($subpanel->canDisplay == true) {
+            return $subpanel;
+        }
+
+        // by default return false so we don't show anything if it's not required.
+        return false;
 	}
 
 	/**
diff --git a/include/SubPanel/SubPanelTiles.js b/include/SubPanel/SubPanelTiles.js
index 0bfb52ee..83934223 100644
--- a/include/SubPanel/SubPanelTiles.js
+++ b/include/SubPanel/SubPanelTiles.js
@@ -70,7 +70,8 @@ var selection_list=popup_reply_data.selection_list;if(selection_list!='undefined
 {query_array.push('subpanel_id[]='+selection_list[the_key])}}
 var module=get_module_name();var id=get_record_id();query_array.push('value=DetailView');query_array.push('module='+module);query_array.push('http_method=get');query_array.push('return_module='+module);query_array.push('return_id='+id);query_array.push('record='+id);query_array.push('isDuplicate=false');query_array.push('action=Save2');query_array.push('inline=1');query_array.push('select_entire_list='+select_entire_list);if(select_entire_list==1){query_array.push('current_query_by_page='+current_query_by_page);}
 var refresh_page=escape(passthru_data['refresh_page']);for(prop in passthru_data){if(prop=='link_field_name'){query_array.push('subpanel_field_name='+escape(passthru_data[prop]));}else{if(prop=='module_name'){query_array.push('subpanel_module_name='+escape(passthru_data[prop]));}else{query_array.push(prop+'='+escape(passthru_data[prop]));}}}
-var query_string=query_array.join('&');request_map[request_id]=passthru_data['child_field'];var returnstuff=http_fetch_sync('index.php',query_string);request_id++;got_data(returnstuff,true);if(refresh_page==1){document.location.reload(true);}}
+var query_string=query_array.join('&');request_map[request_id]=passthru_data['child_field'];var returnstuff=http_fetch_sync('index.php',query_string);request_id++;if(typeof returnstuff!='undefined'&&typeof returnstuff.responseText!='undefined'&&returnstuff.responseText.length!=0){got_data(returnstuff,true);}
+if(refresh_page==1){document.location.reload(true);}}
 function got_data(args,inline)
 {var list_subpanel=document.getElementById('list_subpanel_'+request_map[args.request_id].toLowerCase());if(list_subpanel!=null){var subpanel=document.getElementById('subpanel_'+request_map[args.request_id].toLowerCase());var child_field=request_map[args.request_id].toLowerCase();if(inline){child_field_loaded[child_field]=2;list_subpanel.innerHTML='';list_subpanel.innerHTML=args.responseText;}else{child_field_loaded[child_field]=1;subpanel.innerHTML='';subpanel.innerHTML=args.responseText;var inlineTable=subpanel.getElementsByTagName('table');inlineTable=inlineTable[1];inlineTable=subpanel.removeChild(inlineTable);var listDiv=document.createElement('div');listDiv.id='list_subpanel_'+request_map[args.request_id].toLowerCase();subpanel.appendChild(listDiv);listDiv.appendChild(inlineTable);}
 subpanel.style.display='';set_div_cookie(subpanel.cookie_name,'');if(current_child_field!=''&&child_field!=current_child_field)
diff --git a/include/SubPanel/SubPanelTiles.php b/include/SubPanel/SubPanelTiles.php
index afccbd69..4da8a151 100644
--- a/include/SubPanel/SubPanelTiles.php
+++ b/include/SubPanel/SubPanelTiles.php
@@ -434,13 +434,15 @@ EOQ;
         //for action button at the top of each subpanel
         // bug#51275: smarty widget to help provide the action menu functionality as it is currently sprinkled throughout the app with html
         $buttons = array();
+        $widget_contents = '';
 		foreach($subpanel_def as $widget_data)
 		{
-            $widget_data['query']=urlencode($panel_query);
-            $widget_data['action'] = $_REQUEST['action'];
-            $widget_data['module'] = $thisPanel->get_inst_prop_value('module');
-            $widget_data['focus'] = $this->focus;
-            $widget_data['subpanel_definition'] = $thisPanel;
+
+			$widget_data['action'] = $_REQUEST['action'];
+			$widget_data['module'] =  $thisPanel->get_inst_prop_value('module');
+			$widget_data['focus'] = $this->focus;
+			$widget_data['subpanel_definition'] = $thisPanel;
+			$widget_contents .= '<td class="buttons">' . "\n";
 
 			if(empty($widget_data['widget_class']))
 			{
diff --git a/include/SugarCharts/Jit/js/sugarCharts.js b/include/SugarCharts/Jit/js/sugarCharts.js
index d4e5bab1..0f0fb7a9 100644
--- a/include/SugarCharts/Jit/js/sugarCharts.js
+++ b/include/SugarCharts/Jit/js/sugarCharts.js
@@ -34,7 +34,17 @@
  ********************************************************************************/
 function loadSugarChart(chartId,jsonFilename,css,chartConfig){if(document.getElementById(chartId)==null){return false;}
 var labelType,useGradients,nativeTextSupport,animate;(function(){var ua=navigator.userAgent,typeOfCanvas=typeof HTMLCanvasElement,nativeCanvasSupport=(typeOfCanvas=='object'||typeOfCanvas=='function'),textSupport=nativeCanvasSupport&&(typeof document.createElement('canvas').getContext('2d').fillText=='function');labelType='Native';nativeTextSupport=labelType=='Native';useGradients=nativeCanvasSupport;animate=false;})();var delay=500;switch(chartConfig["chartType"]){case"barChart":var handleFailure=function(o){alert('fail');if(o.responseText!==undefined){alert('failed');}}
-var handleSuccess=function(o){if(o.responseText!==undefined&&o.responseText!="No Data"){var json=eval('('+o.responseText+')');var properties=$jit.util.splat(json.properties)[0];var marginBottom=(chartConfig["orientation"]=='vertical'&&json.values.length>8)?20*4:20;var barChart=new $jit.BarChart({injectInto:chartId,animate:false,nodeCount:json.values.length,renderBackground:chartConfig['imageExportType']=="jpg"?true:false,backgroundColor:'rgb(255,255,255)',colorStop1:'rgba(255,255,255,.8)',colorStop2:'rgba(255,255,255,0)',shadow:{enable:true,size:2},orientation:chartConfig["orientation"],hoveredColor:false,Title:{text:properties['title'],size:16,color:'#444444',offset:20},Subtitle:{text:properties['subtitle'],size:11,color:css["color"],offset:20},Ticks:{enable:true,color:css["gridLineColor"]},barsOffset:(chartConfig["orientation"]=="vertical")?30:20,Margin:{top:20,left:30,right:20,bottom:marginBottom},ScrollNote:{text:(chartConfig["scroll"]&&SUGAR.util.isTouchScreen())?"Use two fingers to scroll":"",size:12},Events:{enable:true,onClick:function(node){if(!node||SUGAR.util.isTouchScreen())return;if(node.link=='undefined'||node.link=='')return;window.location.href=node.link;}},labelOffset:5,type:useGradients?chartConfig["barType"]+':gradient':chartConfig["barType"],showAggregates:true,showLabels:true,Label:{type:labelType,size:12,family:css["font-family"],color:css["color"],colorAlt:"#ffffff"},Tips:{enable:true,onShow:function(tip,elem){if(elem.link!='undefined'&&elem.link!=''){drillDown=(SUGAR.util.isTouchScreen())?"<br><a href='"+elem.link+"'>Click to drilldown</a>":"<br>Click to drilldown";}else{drillDown="";}
+var handleSuccess=function(o){if(o.responseText!==undefined&&o.responseText!="No Data"){var json=eval('('+o.responseText+')');var properties=$jit.util.splat(json.properties)[0];var marginBottom=(chartConfig["orientation"]=='vertical'&&json.values.length>8)?20*4:20;if(chartConfig["orientation"]=='vertical')
+{function fixChartContainer(event,itemsCount)
+{var region=YAHOO.util.Dom.getRegion('content');if(region&&region.width)
+{var realWidth=itemsCount*40;if(realWidth>region.width)
+{var chartCanvas=YAHOO.util.Dom.getElementsByClassName('chartCanvas','div');var chartContainer=YAHOO.util.Dom.getElementsByClassName('chartContainer','div');if(chartContainer.length>0&&chartCanvas.length>0)
+{chartContainer=YAHOO.util.Dom.get(chartContainer[0])
+YAHOO.util.Dom.setStyle(chartContainer,'width',region.width+'px')
+chartCanvas=YAHOO.util.Dom.get(chartCanvas[0]);YAHOO.util.Dom.setStyle(chartCanvas,'width',realWidth+'px');if(!event)
+{YAHOO.util.Event.addListener(window,"resize",fixChartContainer,json.values.length);}}}}}
+fixChartContainer(null,json.values.length);}
+var barChart=new $jit.BarChart({injectInto:chartId,animate:false,nodeCount:json.values.length,renderBackground:chartConfig['imageExportType']=="jpg"?true:false,backgroundColor:'rgb(255,255,255)',colorStop1:'rgba(255,255,255,.8)',colorStop2:'rgba(255,255,255,0)',shadow:{enable:true,size:2},orientation:chartConfig["orientation"],hoveredColor:false,Title:{text:properties['title'],size:16,color:'#444444',offset:20},Subtitle:{text:properties['subtitle'],size:11,color:css["color"],offset:20},Ticks:{enable:true,color:css["gridLineColor"]},barsOffset:(chartConfig["orientation"]=="vertical")?30:20,Margin:{top:20,left:30,right:20,bottom:marginBottom},ScrollNote:{text:(chartConfig["scroll"]&&SUGAR.util.isTouchScreen())?"Use two fingers to scroll":"",size:12},Events:{enable:true,onClick:function(node){if(!node||SUGAR.util.isTouchScreen())return;if(node.link=='undefined'||node.link=='')return;window.location.href=node.link;}},labelOffset:5,type:useGradients?chartConfig["barType"]+':gradient':chartConfig["barType"],showAggregates:true,showLabels:true,Label:{type:labelType,size:12,family:css["font-family"],color:css["color"],colorAlt:"#ffffff"},Tips:{enable:true,onShow:function(tip,elem){if(elem.link!='undefined'&&elem.link!=''){drillDown=(SUGAR.util.isTouchScreen())?"<br><a href='"+elem.link+"'>Click to drilldown</a>":"<br>Click to drilldown";}else{drillDown="";}
 if(elem.valuelabel!='undefined'&&elem.valuelabel!=undefined&&elem.valuelabel!=''){value="elem.valuelabel";}else{value="elem.value";}
 eval("tip.innerHTML = '<b>' + elem."+chartConfig["tip"]+" + '</b>: ' + "+value+" + ' - ' + elem.percentage + '%' + drillDown");}}});barChart.loadJSON(json);var list=$jit.id('legend'+chartId);var legend=barChart.getLegend(),cols=(typeof SUGAR=='undefined'||typeof SUGAR.mySugar=='undefined')?8:4,rows=Math.ceil(legend["name"].length/cols),table="<table cellpadding='0' cellspacing='0' align='left'>";var j=0;for(i=0;i<rows;i++){table+="<tr>";for(td=0;td<cols;td++){table+='<td width=\'16\' valign=\'top\'>';if(legend["name"][j]!=undefined){table+='<div class=\'query-color\' style=\'background-color:'
 +legend["color"][j]+'\'>&nbsp;</div>';}
diff --git a/include/SugarCharts/SugarChart.php b/include/SugarCharts/SugarChart.php
index 7dc73d5d..1d0a1d35 100644
--- a/include/SugarCharts/SugarChart.php
+++ b/include/SugarCharts/SugarChart.php
@@ -186,6 +186,7 @@ class SugarChart {
 
 		// grab the property and value from the chart_properties variable
 		foreach ($this->chart_properties as $key => $value){
+		    if(is_array($value)) continue;
 			$properties .= $this->tab("<$key>$value</$key>",2);
 		}
 
@@ -760,7 +761,7 @@ class SugarChart {
 		return $templateFile;
 	}
 
- 	        
+
 	function getDashletScript($id,$xmlFile="") {
 
 	$xmlFile = (!$xmlFile) ? $sugar_config['tmp_dir']. $current_user->id . '_' . $this->id . '.xml' : $xmlFile;
diff --git a/include/SugarFields/Fields/Datetime/SugarFieldDatetime.php b/include/SugarFields/Fields/Datetime/SugarFieldDatetime.php
index f88d242b..3f2b7fba 100644
--- a/include/SugarFields/Fields/Datetime/SugarFieldDatetime.php
+++ b/include/SugarFields/Fields/Datetime/SugarFieldDatetime.php
@@ -60,14 +60,15 @@ class SugarFieldDatetime extends SugarFieldBase {
         if(!isset($displayParams['hiddeCalendar'])) {
            $displayParams['hiddeCalendar'] = false;
         }
-
-        $this->setup($parentFieldArray, $vardef, $displayParams, $tabindex);
+        
+        // jpereira@dri - #Bug49552 - Datetime field unable to follow parent class methods
         //jchi , bug #24557 , 10/31/2008
         if(isset($vardef['name']) && ($vardef['name'] == 'date_entered' || $vardef['name'] == 'date_modified')){
-        	return $this->fetch($this->findTemplate('DetailView'));
+            return $this->getDetailViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
         }
         //end
-        return $this->fetch($this->findTemplate('EditView'));
+        return parent::getEditViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex);
+        // ~ jpereira@dri - #Bug49552 - Datetime field unable to follow parent class methods
     }
 
     function getImportViewSmarty($parentFieldArray, $vardef, $displayParams, $tabindex)
@@ -200,12 +201,10 @@ class SugarFieldDatetime extends SugarFieldBase {
             //date is not in proper user format, so get the SugarDateTiemObject and inject the vardef with a new element
             $sdt = $timedate->fromString($vardef['value'],$current_user);
 
-            if (!empty($sdt))
-            {
+            if (!empty($sdt)) {
                 //the new 'date_formatted_value' array element will be used in include/SugarFields/Fields/Datetime/DetailView.tpl if it exists
                 $vardef['date_formatted_value'] = $timedate->asUserDate($sdt,$current_user);
             }
-
         }
 
         return $this->getSmartyView($parentFieldArray, $vardef, $displayParams, $tabindex, 'DetailView');
diff --git a/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js b/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
index 7c14a7be..92aa09a5 100644
--- a/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
+++ b/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
@@ -36,10 +36,10 @@ function Datetimecombo(datetime,field,timeformat,tabindex,showCheckbox,checked,a
 this.fieldname=field;if(datetime!='')
 {parts=datetime.split(' ');this.hrs=parseInt(parts[1].substring(0,2),10);this.mins=parseInt(parts[1].substring(3,5),10);}
 this.timeformat=timeformat;this.tabindex=tabindex==null||isNaN(tabindex)?1:tabindex;this.timeseparator=this.timeformat.substring(2,3);this.has12Hours=/^11/.test(this.timeformat);this.hasMeridiem=/am|pm/i.test(this.timeformat);if(this.hasMeridiem){this.pm=/pm/.test(this.timeformat);}
-this.meridiem=this.hasMeridiem?trim(this.datetime.substring(16)):'';this.datetime=this.datetime.substr(0,10);this.showCheckbox=showCheckbox;this.checked=parseInt(checked);document.getElementById(this.fieldname+'_date').value=this.datetime;if(this.mins>0&&this.mins<15){this.mins=15;}else if(this.mins>15&&this.mins<30){this.mins=30;}else if(this.mins>30&&this.mins<45){this.mins=45;}else if(this.mins>45){this.hrs+=1;this.mins=0;if(this.hasMeridiem&&this.hrs==12){if(this.meridiem=="pm"||this.meridiem=="am"){if(this.meridiem=="pm"){this.meridiem="am";}else{this.meridiem="pm";}}else{if(this.meridiem=="PM"){this.meridiem="AM";}else{this.meridiem="PM";}}}
+this.meridiem=this.hasMeridiem?trim(this.datetime.substring(16)):'';this.datetime=this.datetime.substr(0,10);this.showCheckbox=showCheckbox;this.checked=parseInt(checked);YAHOO.util.Selector.query('input#'+this.fieldname+'_date')[0].value=this.datetime;if(this.mins>0&&this.mins<15){this.mins=15;}else if(this.mins>15&&this.mins<30){this.mins=30;}else if(this.mins>30&&this.mins<45){this.mins=45;}else if(this.mins>45){this.hrs+=1;this.mins=0;if(this.hasMeridiem&&this.hrs==12){if(this.meridiem=="pm"||this.meridiem=="am"){if(this.meridiem=="pm"){this.meridiem="am";}else{this.meridiem="pm";}}else{if(this.meridiem=="PM"){this.meridiem="AM";}else{this.meridiem="PM";}}}
 if(this.hasMeridiem&&this.hrs>12){this.hrs=this.hrs-12;}}}
-Datetimecombo.prototype.jsscript=function(callback){text='\nfunction update_'+this.fieldname+'(calendar) {';text+='\nd = document.getElementById("'+this.fieldname+'_date").value;';text+='\nh = document.getElementById("'+this.fieldname+'_hours").value;';text+='\nm = document.getElementById("'+this.fieldname+'_minutes").value;';text+='\nnewdate = d + " " + h + "'+this.timeseparator+'" + m;';if(this.hasMeridiem){text+='\nif(typeof document.getElementById("'+this.fieldname+'_meridiem") != "undefined") {';text+='\n   newdate += document.getElementById("'+this.fieldname+'_meridiem").value;';text+='\n}';}
-text+='\nif(trim(newdate) =="'+this.timeseparator+'") newdate="";';text+='\ndocument.getElementById("'+this.fieldname+'").value = newdate;';text+='\n'+callback;text+='\n}';return text;}
+Datetimecombo.prototype.jsscript=function(callback){text='\nfunction update_'+this.fieldname+'(calendar) {';text+='\nd = YAHOO.util.Selector.query("input#'+this.fieldname+'_date")[0].value;';text+='\nh = YAHOO.util.Selector.query("select#'+this.fieldname+'_hours")[0].value;';text+='\nm = YAHOO.util.Selector.query("select#'+this.fieldname+'_minutes")[0].value;';text+='\nnewdate = d + " " + h + "'+this.timeseparator+'" + m;';if(this.hasMeridiem){text+='\nif(typeof YAHOO.util.Selector.query("select#'+this.fieldname+'_meridiem")[0] != "undefined") {';text+='\n   newdate += YAHOO.util.Selector.query("select#'+this.fieldname+'_meridiem")[0].value;';text+='\n}';}
+text+='\nif(trim(newdate) =="'+this.timeseparator+'") newdate="";';text+='\nYAHOO.util.Selector.query("select#'+this.fieldname+'")[0].value = newdate;';text+='\n'+callback;text+='\n}';return text;}
 Datetimecombo.prototype.html=function(callback){var text='<span style="position:relative; top:6px;"><select class="datetimecombo_time" size="1" id="'+this.fieldname+'_hours" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'">';var h1=this.has12Hours?1:0;var h2=this.has12Hours?12:23;if(this.allowEmptyHM){text+='<option></option>';}
 for(i=h1;i<=h2;i++){val=i<10?"0"+i:i;text+='<option value="'+val+'" '+(i==this.hrs?"SELECTED":"")+'>'+val+'</option>';}
 text+='\n</select>&nbsp;';text+=this.timeseparator;text+='\n&nbsp;<select class="datetimecombo_time" size="1" id="'+this.fieldname+'_minutes" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'">';if(this.allowEmptyHM){text+='\n<option></option>';}
@@ -47,8 +47,11 @@ text+='\n<option value="00" '+(this.mins==0?"SELECTED":"")+'>00</option>';text+=
 text+='\n<option value="'+(this.pm?"am":"AM")+'" '+(/am/i.test(this.meridiem)?"SELECTED":"")+'>'+(this.pm?"am":"AM")+'</option>';text+='\n<option value="'+(this.pm?"pm":"PM")+'" '+(/pm/i.test(this.meridiem)?"SELECTED":"")+'>'+(this.pm?"pm":"PM")+'</option>';text+='\n</select>';}
 if(this.showCheckbox){text+='\n<input style="visibility:hidden;" type="checkbox" name="'+this.fieldname+'_flag" id="'+this.fieldname+'_flag" tabindex="'+this.tabindex+'" onchange="combo_'+this.fieldname+'.update(); '+callback+'" '+(this.checked?'CHECKED':'')+'>';}
 text+='</span>';return text;};Datetimecombo.prototype.update=function(updateListeners){if(typeof(updateListeners)=="undefined")
-updateListeners=true;var d=window.document.getElementById(this.fieldname+'_date');var h=window.document.getElementById(this.fieldname+'_hours');var m=window.document.getElementById(this.fieldname+'_minutes');var mer=document.getElementById(this.fieldname+"_meridiem");if(d.value==""){h.selectedIndex=0;m.selectedIndex=0;if(mer)mer.selectedIndex=0;}else{if(this.allowEmptyHM){if(h.selectedIndex==0)h.selectedIndex=12;if(m.selectedIndex==0)m.selectedIndex=1;if(mer&&(mer.selectedIndex==0))mer.selectedIndex=1;}}
-var newdate=d.value+' '+h.value+this.timeseparator+m.value;if(this.hasMeridiem){ampm=document.getElementById(this.fieldname+"_meridiem").value;newdate+=ampm;}
+updateListeners=true;var d=YAHOO.util.Selector.query('input#'+this.fieldname+'_date')[0];var h=YAHOO.util.Selector.query('select#'+this.fieldname+'_hours')[0];var m=YAHOO.util.Selector.query('select#'+this.fieldname+'_minutes')[0];var mer=YAHOO.util.Selector.query('select#'+this.fieldname+"_meridiem")[0];if(d.value==""){h.selectedIndex=0;m.selectedIndex=0;if(mer)mer.selectedIndex=0;}else{if(this.allowEmptyHM){if(h.selectedIndex==0)h.selectedIndex=12;if(m.selectedIndex==0)m.selectedIndex=1;if(mer&&(mer.selectedIndex==0))mer.selectedIndex=1;}}
+var newdate=d.value+' '+h.value+this.timeseparator+m.value;if(this.hasMeridiem){ampm=YAHOO.util.Selector.query('select#'+this.fieldname+"_meridiem")[0].value;newdate+=ampm;}
 if(trim(newdate)==""+this.timeseparator+""){newdate='';}
-document.getElementById(this.fieldname).value=newdate;if(updateListeners)
-SUGAR.util.callOnChangeListers(this.fieldname);if(this.showCheckbox){flag=this.fieldname+'_flag';date=this.fieldname+'_date';hours=this.fieldname+'_hours';mins=this.fieldname+'_minutes';if(document.getElementById(flag).checked){document.getElementById(flag).value=1;document.getElementById(this.fieldname).value='';document.getElementById(date).disabled=true;document.getElementById(hours).disabled=true;document.getElementById(mins).disabled=true;}else{document.getElementById(flag).value=0;document.getElementById(date).disabled=false;document.getElementById(hours).disabled=false;document.getElementById(mins).disabled=false;}}};
\ No newline at end of file
+YAHOO.util.Selector.query('input#'+this.fieldname)[0].value=newdate;if(updateListeners)
+SUGAR.util.callOnChangeListers(this.fieldname);if(this.showCheckbox){flag=this.fieldname+'_flag';date=this.fieldname+'_date';hours=this.fieldname+'_hours';mins=this.fieldname+'_minutes';if(YAHOO.util.Selector.query('input#'+flag)[0].checked)
+{YAHOO.util.Selector.query('input#'+flag)[0].value=1;YAHOO.util.Selector.query('input#'+this.fieldname)[0].value='';YAHOO.util.Selector.query('input#'+date)[0].disabled=true;YAHOO.util.Selector.query('select#'+hours)[0].disabled=true;YAHOO.util.Selector.query('select#'+mins)[0].disabled=true;}
+else
+{YAHOO.util.Selector.query('input#'+flag)[0].value=0;YAHOO.util.Selector.query('input#'+date)[0].disabled=false;YAHOO.util.Selector.query('select#'+hours)[0].disabled=false;YAHOO.util.Selector.query('select#'+mins)[0].disabled=false;}}};
\ No newline at end of file
diff --git a/include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php b/include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php
index 649a920c..d6ec53d3 100644
--- a/include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php
+++ b/include/SugarFields/Fields/Datetimecombo/SugarFieldDatetimecombo.php
@@ -154,5 +154,57 @@ class SugarFieldDatetimecombo extends SugarFieldBase {
             }
         }
     }
+
+    /**
+     * @see SugarFieldBase::importSanitize()
+     */
+    public function importSanitize(
+        $value,
+        $vardef,
+        $focus,
+        ImportFieldSanitize $settings
+        )
+    {
+        global $timedate;
+
+        $format = $timedate->merge_date_time($settings->dateformat, $settings->timeformat);
+
+        if ( !$timedate->check_matching_format($value, $format) ) {
+            $parts = $timedate->split_date_time($value);
+            if(empty($parts[0])) {
+               $datepart = $timedate->getNow()->format($settings->dateformat);
+            }
+            else {
+               $datepart = $parts[0];
+            }
+            if(empty($parts[1])) {
+                $timepart = $timedate->fromTimestamp(0)->format($settings->timeformat);
+            } else {
+                $timepart = $parts[1];
+                // see if we can get by stripping the seconds
+                if(strpos($settings->timeformat, 's') === false) {
+                    $sep = $timedate->timeSeparatorFormat($settings->timeformat);
+                    // We are assuming here seconds are the last component, which
+                    // is kind of reasonable - no sane time format puts seconds first
+                    $timeparts = explode($sep, $timepart);
+                    if(!empty($timeparts[2])) {
+                        $timepart = join($sep, array($timeparts[0], $timeparts[1]));
+                    }
+                }
+            }
+
+            $value = $timedate->merge_date_time($datepart, $timepart);
+            if ( !$timedate->check_matching_format($value, $format) ) {
+                return false;
+            }
+        }
+
+        try {
+            $date = SugarDateTime::createFromFormat($format, $value, new DateTimeZone($settings->timezone));
+        } catch(Exception $e) {
+            return false;
+        }
+        return $date->asDb();
+    }
 }
-?>
\ No newline at end of file
+?>
diff --git a/include/SugarFields/Fields/Link/EditView.tpl b/include/SugarFields/Fields/Link/EditView.tpl
index 7cbb7edc..4b127dd8 100644
--- a/include/SugarFields/Fields/Link/EditView.tpl
+++ b/include/SugarFields/Fields/Link/EditView.tpl
@@ -41,7 +41,9 @@
 	   {{if !empty($vardef.len)}}maxlength='{{$vardef.len}}'{{/if}} value='{{sugarvar key='value'}}' title='{{$vardef.help}}' tabindex='{{$tabindex}}' {{if !empty($displayParams.accesskey)}} accesskey='{{$displayParams.accesskey}}' {{/if}} >
 	{else}
 	<input type='text' name='{{if empty($displayParams.idName)}}{{sugarvar key='name'}}{{else}}{{$displayParams.idName}}{{/if}}' id='{{if empty($displayParams.idName)}}{{sugarvar key='name'}}{{else}}{{$displayParams.idName}}{{/if}}' size='{{$displayParams.size|default:30}}' 
-	   {{if !empty($vardef.len)}}maxlength='{{$vardef.len}}'{{/if}} 
-	   {if $displayView=='advanced_search'||$displayView=='basic_search'}value=''{else}value='http://'{/if} title='{{$vardef.help}}' tabindex='{{$tabindex}}' {{if !empty($displayParams.accesskey)}} accesskey='{{$displayParams.accesskey}}' {{/if}} >
+	   {{if !empty($vardef.len)}}maxlength='{{$vardef.len}}'{{/if}}
+	   {{if !empty($vardef.len) && $vardef.len >= 7}}
+	   {if $displayView=='advanced_search'||$displayView=='basic_search'}value=''{else}value='http://'{/if} 
+	   {{else}} value='' {{/if}} title='{{$vardef.help}}' tabindex='{{$tabindex}}' {{if !empty($displayParams.accesskey)}} accesskey='{{$displayParams.accesskey}}' {{/if}} >
 	{/if}
 {{/if}}
\ No newline at end of file
diff --git a/include/SugarFields/Fields/Parent/SearchView.tpl b/include/SugarFields/Fields/Parent/SearchView.tpl
index c7ffd68d..b184818d 100644
--- a/include/SugarFields/Fields/Parent/SearchView.tpl
+++ b/include/SugarFields/Fields/Parent/SearchView.tpl
@@ -40,9 +40,7 @@ onchange='document.{{$form_name}}.{{sugarvar key='name'}}.value="";document.{{$f
         changeParentQSSearchView("{{sugarvar key='name'}}"); checkParentType(document.{{$form_name}}.{{$vardef.type_name}}.value, document.{{$form_name}}.btn_{{sugarvar key='name'}});'>
 {html_options options={{sugarvar key='options' string=true}} selected=$fields.{{$vardef.type_name}}.value}
 </select>
-{{if $displayParams.split}}
 <br>
-{{/if}}
 {if empty({{sugarvar key='options' string=true}}[$fields.{{$vardef.type_name}}.value])}
 	{assign var="keepParent" value = 0}
 {else}
diff --git a/include/SugarFields/Fields/Relate/SugarFieldRelate.php b/include/SugarFields/Fields/Relate/SugarFieldRelate.php
index 96abb452..dd706ea0 100644
--- a/include/SugarFields/Fields/Relate/SugarFieldRelate.php
+++ b/include/SugarFields/Fields/Relate/SugarFieldRelate.php
@@ -101,7 +101,7 @@ class SugarFieldRelate extends SugarFieldBase {
             $field_to_name = array();
             $field_to_name['id'] = $vardef['id_name'];
             $field_to_name['name'] = $vardef['name'];
-            $address_fields = array('_address_street', '_address_city', '_address_state', '_address_postalcode', '_address_country');
+            $address_fields = isset($displayParams['field_to_name_array']) ? $displayParams['field_to_name_array'] : array('_address_street', '_address_city', '_address_state', '_address_postalcode', '_address_country');
             $count = 0;
             foreach($form as $f) {
                 foreach($address_fields as $afield) {
diff --git a/include/SugarFolders/SugarFolders.php b/include/SugarFolders/SugarFolders.php
index b12c8437..b5cc1a2a 100644
--- a/include/SugarFolders/SugarFolders.php
+++ b/include/SugarFolders/SugarFolders.php
@@ -344,7 +344,7 @@ ENDQ;
 				  " JOIN emails_text on emails.id = emails_text.email_id
                   WHERE folders_rel.folder_id = '{$folderId}' AND folders_rel.deleted = 0 AND emails.deleted = 0";
 			if ($this->is_group) {
-				$q = $q . " AND emails.assigned_user_id is null";
+				$q = $q . " AND (emails.assigned_user_id is null or emails.assigned_user_id = '')";
 			}
 			$r = $this->db->limitQuery($q . $order, $start, $pageSize);
 		}
@@ -400,7 +400,7 @@ ENDQ;
 			$q = "SELECT count(*) c FROM folders_rel JOIN emails ON emails.id = folders_rel.polymorphic_id" .
 			" WHERE folder_id = '{$folderId}' AND folders_rel.deleted = 0 AND emails.deleted = 0" ;
 			if ($this->is_group) {
-				$q .= " AND emails.assigned_user_id IS null";
+				$q .= " AND (emails.assigned_user_id is null or emails.assigned_user_id = '')";
 			}
 			$r = $this->db->query ( $q ) ;
 		}
@@ -426,7 +426,7 @@ ENDQ;
             $q = "SELECT count(*) c FROM folders_rel fr JOIN emails on fr.folder_id = '{$folderId}' AND fr.deleted = 0 " .
                "AND fr.polymorphic_id = emails.id AND emails.status = 'unread' AND emails.deleted = 0" ;
             if ($this->is_group) {
-                $q .= " AND emails.assigned_user_id IS null";
+                $q .= " AND (emails.assigned_user_id is null or emails.assigned_user_id = '')";
             }
             $r = $this->db->query ( $q ) ;
         }
diff --git a/include/SugarObjects/templates/file/vardefs.php b/include/SugarObjects/templates/file/vardefs.php
index ebb79c8f..303e6437 100644
--- a/include/SugarObjects/templates/file/vardefs.php
+++ b/include/SugarObjects/templates/file/vardefs.php
@@ -62,7 +62,8 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
   array(
 	'name'=>'name',
 	'source'=>'non-db',
-	'type'=>'varchar'
+	'type'=>'varchar',
+	'db_concat_fields'=> array(0=>'document_name'),
 	),
 
 'filename' =>
diff --git a/include/SugarObjects/templates/issue/vardefs.php b/include/SugarObjects/templates/issue/vardefs.php
index 409424f9..ec3a30ac 100644
--- a/include/SugarObjects/templates/issue/vardefs.php
+++ b/include/SugarObjects/templates/issue/vardefs.php
@@ -49,6 +49,7 @@ $vardefs = array (
 			'comment' => 'Visual unique identifier',
 			'duplicate_merge' => 'disabled',
 			'disable_num_format' => true,
+			'studio' => array('quickcreate' => false),
 		),
 
 		'name' => array (
diff --git a/include/SugarObjects/templates/person/metadata/subpanels/default.php b/include/SugarObjects/templates/person/metadata/subpanels/default.php
index 7d211c1a..92020d98 100644
--- a/include/SugarObjects/templates/person/metadata/subpanels/default.php
+++ b/include/SugarObjects/templates/person/metadata/subpanels/default.php
@@ -74,6 +74,7 @@ $subpanel_layout = array(
 			'vname' => 'LBL_LIST_EMAIL',
 			'widget_class' => 'SubPanelEmailLink',
 			'width' => '35%',
+			'sortable' => false,
 		),
 		'phone_work'=>array (
 			'name'=>'phone_work',		
diff --git a/include/SugarTheme/SugarTheme.php b/include/SugarTheme/SugarTheme.php
index 732aeb47..faa33e0d 100644
--- a/include/SugarTheme/SugarTheme.php
+++ b/include/SugarTheme/SugarTheme.php
@@ -566,21 +566,21 @@ class SugarTheme
 
 			// system wide sprites
 			if(file_exists("cache/sprites/default/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="cache/sprites/default/sprites.css" />';
+				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/default/sprites.css').'" />';
 
 			// theme specific sprites
 			if(file_exists("cache/sprites/{$this->dirName}/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="cache/sprites/'.$this->dirName.'/sprites.css" />';
+				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$this->dirName.'/sprites.css').'" />';
 
 			// parent sprites
 			if($this->parentTheme && $parent = SugarThemeRegistry::get($this->parentTheme)) {
 				if(file_exists("cache/sprites/{$parent->dirName}/sprites.css"))
-					$html .= '<link rel="stylesheet" type="text/css" href="cache/sprites/'.$parent->dirName.'/sprites.css" />';
+					$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/'.$parent->dirName.'/sprites.css').'" />';
 			}
 
 			// repeatable sprites
 			if(file_exists("cache/sprites/Repeatable/sprites.css"))
-				$html .= '<link rel="stylesheet" type="text/css" href="cache/sprites/Repeatable/sprites.css" />';
+				$html .= '<link rel="stylesheet" type="text/css" href="'.getJSPath('cache/sprites/Repeatable/sprites.css').'" />';
 		}
 
         // for BC during upgrade
diff --git a/include/Sugar_Smarty.php b/include/Sugar_Smarty.php
index c18235aa..f0a0d59e 100644
--- a/include/Sugar_Smarty.php
+++ b/include/Sugar_Smarty.php
@@ -49,7 +49,6 @@ if(!defined('SUGAR_SMARTY_DIR'))
  */
 class Sugar_Smarty extends Smarty
 {
-
 	function Sugar_Smarty()
 	{
 		if(!file_exists(SUGAR_SMARTY_DIR))mkdir_recursive(SUGAR_SMARTY_DIR, true);
@@ -73,6 +72,19 @@ class Sugar_Smarty extends Smarty
 		$this->assign("VERSION_MARK", getVersionedPath(''));
 	}
 
+	/**
+	 * Override default _unlink method call to fix Bug 53010
+	 *
+	 * @param string $resource
+     * @param integer $exp_time
+     */
+    function _unlink($resource, $exp_time = null)
+    {
+        if(file_exists($resource)) {
+            return parent::_unlink($resource, $exp_time);
+        }
+        
+        // file wasn't found, so it must be gone.
+        return true;
+    }
 }
-
-?>
diff --git a/include/clean.php b/include/clean.php
index 210c6ccd..92f00c50 100644
--- a/include/clean.php
+++ b/include/clean.php
@@ -262,8 +262,11 @@ class SugarURIFilter extends HTMLPurifier_URIFilter
         // Here we try to block URLs that may be used for nasty XSRF stuff by
         // referring back to Sugar URLs
         // allow URLs that don't start with /? or /index.php?
-		if(!empty($uri->path) && $uri->path != '/' && strtolower(substr($uri->path, -10)) != '/index.php') {
-			return true;
+		if(!empty($uri->path) && $uri->path != '/') {
+		    $lpath = strtolower($uri->path);
+		    if(substr($lpath, -10) != '/index.php' && $lpath != 'index.php') {
+    			return true;
+	    	}
 		}
 
         $query_items = array();
diff --git a/include/connectors/utils/ConnectorHtmlHelper.php b/include/connectors/utils/ConnectorHtmlHelper.php
new file mode 100644
index 00000000..1843ade8
--- /dev/null
+++ b/include/connectors/utils/ConnectorHtmlHelper.php
@@ -0,0 +1,168 @@
+<?php
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+/**
+ * Connector's HTML helper
+ * @api
+ */
+class ConnectorHtmlHelper
+{
+    /**
+     * Method return the HTML code for the hover link field
+     *
+     * @param array $shown_sources
+     * @param mixed $module
+     * @param mixed $smarty
+     * @return string
+     */
+    public function getConnectorButtonCode(array $shown_sources, $module, $smarty)
+    {
+        require_once('include/connectors/formatters/FormatterFactory.php');
+
+        //If there is only one source, just show the icon or some standalone view
+        if (count($shown_sources) == 1)
+        {
+            $code = $this->getButton($shown_sources[0], $module, $smarty);
+        }
+        else
+        {
+            $code = $this->getPopup($shown_sources, $module, $smarty);
+        }
+
+        return $code;
+    }
+
+    /**
+     * Get button for source
+     *
+     * @param string $shown_source
+     * @param mixed $module
+     * @param mixed $smarty
+     * @return string
+     */
+    private function getButton($shown_source, $module, $smarty)
+    {
+        $code = '';
+
+        $formatter = FormatterFactory::getInstance($shown_source);
+        $formatter->setModule($module);
+        $formatter->setSmarty($smarty);
+        $formatter_code = $formatter->getDetailViewFormat();
+        if (!empty($formatter_code))
+        {
+            $iconFilePath = $formatter->getIconFilePath();
+            $iconFilePath = empty($iconFilePath) ? 'themes/default/images/MoreDetail.png' : $iconFilePath;
+
+            $code = '<!--not_in_theme!--><img id="dswidget_img" border="0" src="' . $iconFilePath .'" alt="'
+                    . $shown_source .'" onmouseover="show_' . $shown_source . '(event);">';
+
+            $code .= "<script type='text/javascript' src='{sugar_getjspath file='include/connectors/formatters/default/company_detail.js'}'></script>";
+            $code .= $formatter->getDetailViewFormat();
+            $code .= $formatter_code;
+        }
+
+        return $code;
+    }
+
+    /**
+     * Get popup for sources
+     *
+     * @param array $shown_sources
+     * @param mixed $module
+     * @param mixed $smarty
+     * @return string
+     */
+    private function getPopup(array $shown_sources, $module, $smarty)
+    {
+        global $app_strings;
+
+        $code = '';
+        $menuParams = 'var menuParams = "';
+        $formatterCode = '';
+        $sourcesDisplayed = 0;
+        $singleIcon = '';
+        foreach($shown_sources as $id)
+        {
+            $formatter = FormatterFactory::getInstance($id);
+            $formatter->setModule($module);
+            $formatter->setSmarty($smarty);
+            $buttonCode = $formatter->getDetailViewFormat();
+            if (!empty($buttonCode))
+            {
+                $sourcesDisplayed++;
+                $singleIcon = $formatter->getIconFilePath();
+                $source = SourceFactory::getSource($id);
+                $config = $source->getConfig();
+                $name = !empty($config['name']) ? $config['name'] : $id;
+                //Create the menu item to call show_[source id] method in javascript
+                $menuParams .= '<a href=\'#\' style=\'width:150px\' class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\''
+                            . ' onmouseout=\'unhiliteItem(this);\' onclick=\'show_' . $id . '(event);\'>' . $name . '</a>';
+                $formatterCode .= $buttonCode;
+            }
+        } //for
+
+        if (!empty($formatterCode))
+        {
+            if ($sourcesDisplayed > 1)
+            {
+                $dswidget_img = SugarThemeRegistry::current()->getImageURL('MoreDetail.png');
+                $code = '<!--not_in_theme!--><img id="dswidget_img" src="' . $dswidget_img . '" width="11" height="7" border="0" alt="'
+                        . $app_strings['LBL_CONNECTORS_POPUPS'] . '" onclick="return showConnectorMenu2(this);">';
+            }
+            else
+            {
+                $dswidget_img = SugarThemeRegistry::current()->getImageURL('MoreDetail.png');
+                $singleIcon = empty($singleIcon) ? $dswidget_img : $singleIcon;
+                $code = '<!--not_in_theme!--><img id="dswidget_img" border="0" src="' . $singleIcon . '" alt="'.$app_strings['LBL_CONNECTORS_POPUPS']
+                        . '" onclick="return showConnectorMenu2(this);">';
+
+            }
+            $code .= "<script type='text/javascript' src='{sugar_getjspath file='include/connectors/formatters/default/company_detail.js'}'></script>\n";
+            $code .= "<script type='text/javascript'>\n";
+            $code .= "function showConnectorMenu2(el) {literal} { {/literal}\n";
+
+            $menuParams .= '";';
+            $code .= $menuParams . "\n";
+            $code .= "return SUGAR.util.showHelpTips(el,menuParams);\n";
+            $code .= "{literal} } {/literal}\n";
+            $code .= "</script>\n";
+            $code .= $formatterCode;
+        }
+        return $code;
+    }
+}
diff --git a/include/connectors/utils/ConnectorHtmlHelperFactory.php b/include/connectors/utils/ConnectorHtmlHelperFactory.php
new file mode 100644
index 00000000..942889d8
--- /dev/null
+++ b/include/connectors/utils/ConnectorHtmlHelperFactory.php
@@ -0,0 +1,65 @@
+<?php
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+/**
+ * Connector's HTML helper factory
+ * @api
+ */
+class ConnectorHtmlHelperFactory
+{
+    const CONNECTOR_HTML_HELPER_MAIN = 'include/connectors/utils/ConnectorHtmlHelper.php';
+    const CONNECTOR_HTML_HELPER_CUSTOM = 'custom/include/connectors/utils/ConnectorHtmlHelper.php';
+
+    /**
+     * Return instance of HTML helper class
+     *
+     * @return ConnectorHtmlHelper
+     */
+    public static function build()
+    {
+        if (file_exists(self::CONNECTOR_HTML_HELPER_CUSTOM))
+        {
+            require_once(self::CONNECTOR_HTML_HELPER_CUSTOM);
+        }
+        else
+        {
+            require_once(self::CONNECTOR_HTML_HELPER_MAIN);
+        }
+        return new ConnectorHtmlHelper();
+    }
+}
\ No newline at end of file
diff --git a/include/connectors/utils/ConnectorUtils.php b/include/connectors/utils/ConnectorUtils.php
index 1633fea1..faf00695 100644
--- a/include/connectors/utils/ConnectorUtils.php
+++ b/include/connectors/utils/ConnectorUtils.php
@@ -743,90 +743,29 @@ class ConnectorUtils
         )
     {
         $module = $displayParams['module'];
-        require_once('include/connectors/utils/ConnectorUtils.php');
         $modules_sources = self::getDisplayConfig();
-        global $current_language, $app_strings;
-        $mod_strings = return_module_language($current_language, 'Connectors');
-        $menuParams = 'var menuParams = "';
+        $code = '';
         $shown_sources = array();
-        if(!empty($module) && !empty($displayParams['connectors'])) {
-            foreach($displayParams['connectors'] as $id) {
-                if(!empty($modules_sources[$module]) && in_array($id, $modules_sources[$module])){
+        if (!empty($module) && !empty($displayParams['connectors']))
+        {
+            foreach ($displayParams['connectors'] as $id)
+             {
+                if (!empty($modules_sources[$module]) && in_array($id, $modules_sources[$module]))
+                {
                     $shown_sources[] = $id;
                 }
-              }
+             }
 
-              if(empty($shown_sources)) {
+              if(empty($shown_sources))
+              {
                     return '';
               }
 
-              require_once('include/connectors/formatters/FormatterFactory.php');
-              $code = '';
-
-              //If there is only one source, just show the icon or some standalone view
-              if(count($shown_sources) == 1) {
-                  $formatter = FormatterFactory::getInstance($shown_sources[0]);
-                  $formatter->setModule($module);
-                  $formatter->setSmarty($smarty);
-                  $formatter_code = $formatter->getDetailViewFormat();
-                  if(!empty($formatter_code)) {
-                      $iconFilePath = $formatter->getIconFilePath();
-                      $iconFilePath = empty($iconFilePath) ? 'themes/default/images/MoreDetail.png' : $iconFilePath;
-
-                      $code = '<!--not_in_theme!--><img id="dswidget_img" border="0" src="' . $iconFilePath .'" alt="' . $shown_sources[0] .'" onmouseover="show_' . $shown_sources[0] . '(event);">';
-
-                      $code .= "<script type='text/javascript' src='{sugar_getjspath file='include/connectors/formatters/default/company_detail.js'}'></script>";
-                      $code .= $formatter->getDetailViewFormat();
-                      $code .= $formatter_code;
-                  }
-                  return $code;
-              } else {
-
-                  $formatterCode = '';
-                  $sourcesDisplayed = 0;
-                  $singleIcon = '';
-                  foreach($shown_sources as $id) {
-                      $formatter = FormatterFactory::getInstance($id);
-                      $formatter->setModule($module);
-                      $formatter->setSmarty($smarty);
-                      $buttonCode = $formatter->getDetailViewFormat();
-                      if(!empty($buttonCode)) {
-                          $sourcesDisplayed++;
-                          $singleIcon = $formatter->getIconFilePath();
-                          $source = SourceFactory::getSource($id);
-                          $config = $source->getConfig();
-                          $name = !empty($config['name']) ? $config['name'] : $id;
-                          //Create the menu item to call show_[source id] method in javascript
-                          $menuParams .= '<a href=\'#\' style=\'width:150px\' class=\'menuItem\' onmouseover=\'hiliteItem(this,\"yes\");\' onmouseout=\'unhiliteItem(this);\' onclick=\'show_' . $id . '(event);\'>' . $name . '</a>';
-                          $formatterCode .= $buttonCode;
-                      }
-                  } //for
-
-                  if(!empty($formatterCode)) {
-                      if($sourcesDisplayed > 1) {
-                      	$dswidget_img = SugarThemeRegistry::current()->getImageURL('MoreDetail.png');
-                        $code = '<!--not_in_theme!--><img id="dswidget_img" src="'.$dswidget_img.'" width="11" height="7" border="0" alt="'.$app_strings['LBL_CONNECTORS_POPUPS'].'" onclick="return showConnectorMenu2(this);">';
-
-                      } else {
-                       	  $dswidget_img = SugarThemeRegistry::current()->getImageURL('MoreDetail.png');
-                          $singleIcon = empty($singleIcon) ? $dswidget_img : $singleIcon;
-                          $code = '<!--not_in_theme!--><img id="dswidget_img" border="0" src="' . $singleIcon . '" alt="'.$app_strings['LBL_CONNECTORS_POPUPS'].'" onclick="return showConnectorMenu2(this);">';
 
-                      }
-                      $code .= "<script type='text/javascript' src='{sugar_getjspath file='include/connectors/formatters/default/company_detail.js'}'></script>\n";
-                      $code .= "<script type='text/javascript'>\n";
-                      $code .= "function showConnectorMenu2(el) {literal} { {/literal}\n";
-
-                      $menuParams .= '";';
-                      $code .= $menuParams . "\n";
-                      $code .= "return SUGAR.util.showHelpTips(el,menuParams);\n";
-                      $code .= "{literal} } {/literal}\n";
-                      $code .= "</script>\n";
-                      $code .= $formatterCode;
-                  }
-                  return $code;
-              } //if-else
+            require_once('include/connectors/utils/ConnectorHtmlHelperFactory.php');
+            $code = ConnectorHtmlHelperFactory::build()->getConnectorButtonCode($shown_sources, $module, $smarty);
         } //if
+        return $code;
     }
 
 
@@ -857,6 +796,30 @@ class ConnectorUtils
         }
     }
 
+     /**
+     * setConnectorStrings
+     * This method outputs the language Strings for a given connector instance
+     *
+     * @param String $source_id String value of the connector id to write language strings for (e.g., ext_soap_marketo)
+     * @param String $connector_strings array value of the connector_strings
+     * @param String $language optional String value for the language to use (defaults to $GLOBALS['current_language'])
+    */
+    public static function setConnectorStrings(
+        $source_id,
+        $connector_strings,
+        $language = ''
+        )
+    {
+        $lang = empty($language) ? $GLOBALS['current_language'] : $language;
+        $lang .= '.lang.php';
+        $dir = str_replace('_', '/', $source_id);
+
+      if (!write_array_to_file("connector_strings", $connector_strings, "custom/modules/Connectors/connectors/sources/{$dir}/language/{$lang}")) {
+           //Log error and return empty array
+           $GLOBALS['log']->fatal("Cannot write connectory_strings to file custom/modules/Connectors/connectors/sources/{$dir}/language/{$lang}");
+           return false;
+        }
+    }
 
     /**
      * installSource
@@ -977,4 +940,4 @@ class ConnectorUtils
         }
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/include/database/DBManager.php b/include/database/DBManager.php
index 6d7f657f..45cfabf0 100644
--- a/include/database/DBManager.php
+++ b/include/database/DBManager.php
@@ -306,7 +306,7 @@ abstract class DBManager
 	public function checkError($msg = '', $dieOnError = false)
 	{
 		if (empty($this->database)) {
-			$this->registerError("$msg: Database Is Not Connected", $dieOnError);
+			$this->registerError($msg, "Database Is Not Connected", $dieOnError);
 			return true;
 		}
 
@@ -2388,8 +2388,9 @@ protected function checkQuery($sql, $object_name = false)
      * @param string $type Column type
      * @return array|bool array containing the different components of the passed in type or false in case the type contains illegal characters
      */
-    public function getTypeParts($type) {
-        if(preg_match("((?'type'\w+)\s*(?'arg'\((?'len'\w+)\s*(,\s*(?'scale'\d+))*\))*)", $type, $matches))
+    public function getTypeParts($type)
+    {
+        if(preg_match("#(?P<type>\w+)\s*(?P<arg>\((?P<len>\w+)\s*(,\s*(?P<scale>\d+))*\))*#", $type, $matches))
         {
             $return = array();  // Not returning matches array as such as we don't want to expose the regex make up on the interface
             $return['baseType'] = $matches['type'];
@@ -2450,10 +2451,20 @@ protected function checkQuery($sql, $object_name = false)
         }
 
         $default = '';
-		if (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
-			$default = " DEFAULT ".$this->quoted($fieldDef['default']);
-		elseif (!isset($fieldDef['default']) && $type == 'bool')
-			$default = " DEFAULT 0 ";
+
+        // Bug #52610 We should have ability don't add DEFAULT part to query for boolean fields
+        if (!empty($fieldDef['no_default']))
+        {
+            // nothing to do
+        }
+        elseif (isset($fieldDef['default']) && strlen($fieldDef['default']) > 0)
+        {
+            $default = " DEFAULT ".$this->quoted($fieldDef['default']);
+        }
+        elseif (!isset($default) && $type == 'bool')
+        {
+            $default = " DEFAULT 0 ";
+        }
 
 		$auto_increment = '';
 		if(!empty($fieldDef['auto_increment']) && $fieldDef['auto_increment'])
@@ -3814,5 +3825,5 @@ protected function checkQuery($sql, $object_name = false)
      * @abstract
      * @return string
      */
-    abstract public function getGuidSQL();
+	abstract public function getGuidSQL();
 }
diff --git a/include/database/MssqlManager.php b/include/database/MssqlManager.php
index 3d4e4329..6763691c 100644
--- a/include/database/MssqlManager.php
+++ b/include/database/MssqlManager.php
@@ -442,8 +442,26 @@ class MssqlManager extends DBManager
                 if ($start == 0) {
                     $match_two = strtolower($matches[2]);
                     if (!strpos($match_two, "distinct")> 0 && strpos($match_two, "distinct") !==0) {
-    					//proceed as normal
-                    	$newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                        if ($count > 20) {
+                            $orderByMatch = array();
+                            preg_match('/^(.*)(ORDER BY)(.*)$/is',$matches[3], $orderByMatch);
+                            if (!empty($orderByMatch[3])) {
+                                $newSQL = "SELECT TOP $count * FROM
+                                    (
+                                        " . $matches[1] . " ROW_NUMBER()
+                                        OVER (ORDER BY " . $this->returnOrderBy($sql, $orderByMatch[3]) . ") AS row_number,
+                                        " . $matches[2] . $orderByMatch[1]. "
+                                    ) AS a
+                                    WHERE row_number > $start";
+                            }
+                            else {
+                                $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                            }
+                        }
+                        else {
+                          //proceed as normal
+                          $newSQL = $matches[1] . " TOP $count " . $matches[2] . $matches[3];
+                        }
                     }
                     else {
                         $distinct_o = strpos($match_two, "distinct");
@@ -791,6 +809,11 @@ class MssqlManager extends DBManager
             //this has a tablename defined, pass in the order match
             return $orig_order_match;
 
+        // If there is no ordering direction (ASC/DESC), use ASC by default
+        if (strpos($orig_order_match, " ") === false) {
+        	$orig_order_match .= " ASC";
+        }
+            
         //grab first space in order by
         $firstSpace = strpos($orig_order_match, " ");
 
@@ -2080,8 +2103,9 @@ EOQ;
      * I.e. generate a unique Sugar id in a sub select of an insert statement.
      * @return string
      */
-        public function getGuidSQL()
+
+	public function getGuidSQL()
     {
-        return 'NEWID()';
+      	return 'NEWID()';
     }
 }
diff --git a/include/database/MysqlManager.php b/include/database/MysqlManager.php
index eee6fb2e..840fec2b 100644
--- a/include/database/MysqlManager.php
+++ b/include/database/MysqlManager.php
@@ -1483,8 +1483,9 @@ class MysqlManager extends DBManager
      * I.e. generate a unique Sugar id in a sub select of an insert statement.
      * @return string
      */
-        public function getGuidSQL()
+
+	public function getGuidSQL()
     {
-        return 'UUID()';
+      	return 'UUID()';
     }
 }
diff --git a/include/generic/LayoutManager.php b/include/generic/LayoutManager.php
index cd1f6cf9..f6eb2ad0 100644
--- a/include/generic/LayoutManager.php
+++ b/include/generic/LayoutManager.php
@@ -305,7 +305,19 @@ class LayoutManager
 			}
 		}
 
+        $parent_bean = null;
+
+        if (isset($widget_def['parent_bean']))
+        {
+            $parent_bean = $widget_def['parent_bean'];
+        }
+        elseif (isset($widget_def['focus']))
+        {
+            $parent_bean = $widget_def['focus'];
+        }
+
 		$widget = new $class_name($this); // cache disabled $this->getClassFromCache($class_name);
+        $widget->setParentBean($parent_bean);
 		return $widget;
 	}
 
diff --git a/include/generic/Save2.php b/include/generic/Save2.php
index 91df3fe6..5bd8fb53 100644
--- a/include/generic/Save2.php
+++ b/include/generic/Save2.php
@@ -58,46 +58,56 @@ ARGS:
 
 require_once('include/formbase.php');
 
-function add_prospects_to_prospect_list($query,$parent_module,$parent_type,$parent_id,$child_id,$link_attribute,$link_type) {
-
-	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$query);
+function add_prospects_to_prospect_list($query_panel,$parent_module,$parent_type,$parent_id,$child_id,$link_attribute,$link_type, $parent)
+{
+	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$query_panel);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$parent_module);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$parent_type);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$parent_id);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$child_id);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$link_attribute);
 	$GLOBALS['log']->debug('add_prospects_to_prospect_list:parameters:'.$link_type);
+    require_once('include/SubPanel/SubPanelTiles.php');
 
 
 	if (!class_exists($parent_type)) {
-		require_once('modules/'.$parent_module.'/'.$parent_type.'.php');
+		require_once('modules/'.cleanDirName($parent_module).'/'.cleanDirName($parent_type).'.php');
 	}
 	$focus = new $parent_type();
 	$focus->retrieve($parent_id);
+	if(empty($focus->id)) {
+	    return false;
+	}
+	if(empty($parent)) {
+	    return false;
+	}
 
 	//if link_type is default then load relationship once and add all the child ids.
 	$relationship_attribute=$link_attribute;
 
 	//find all prospects based on the query
-	$db = DBManagerFactory::getInstance();
-	$result=$db->query($query);
-	while(($row=$db->fetchByAssoc($result)) != null) {
-
-		$GLOBALS['log']->debug('target_id'.$row[$child_id]);
-
-		if ($link_type != 'default') {
-			$relationship_attribute=strtolower($row[$link_attribute]);
-		}
 
-		$GLOBALS['log']->debug('add_prospects_to_prospect_list:relationship_attribute:'.$relationship_attribute);
-
-		//load relationship for the first time or on change of relationship attribute.
-		if (empty($focus->$relationship_attribute)) {
-			$focus->load_relationship($relationship_attribute);
-		}
-		//add
-		$focus->$relationship_attribute->add($row[$child_id]);
-	}
+	$subpanel = new SubPanelTiles($parent, $parent->module_dir);
+    $thisPanel=$subpanel->subpanel_definitions->load_subpanel($query_panel);
+    if(empty($thisPanel)) {
+        return false;
+    }
+    $result = SugarBean::get_union_related_list($parent, '', '', '', 0, -1,-1,'', $thisPanel);
+
+    if(!empty($result['list'])) {
+        foreach($result['list'] as $object) {
+		    if ($link_type != 'default') {
+			    $relationship_attribute=strtolower($object->$link_attribute);
+		    }
+            $GLOBALS['log']->debug('add_prospects_to_prospect_list:relationship_attribute:'.$relationship_attribute);
+		    // load relationship for the first time or on change of relationship atribute.
+		    if (empty($focus->$relationship_attribute)) {
+			    $focus->load_relationship($relationship_attribute);
+		    }
+		    //add
+		    $focus->$relationship_attribute->add($object->$child_id);
+        }
+    }
 }
 
 //Link rows returned by a report to parent record.
@@ -153,8 +163,9 @@ if (isset($_REQUEST['return_type'])  && $_REQUEST['return_type'] == 'report') {
 } else if (isset($_REQUEST['return_type'])  && $_REQUEST['return_type'] == 'addtoprospectlist') {
 
 	$GLOBALS['log']->debug(print_r($_REQUEST,true));
-	add_prospects_to_prospect_list(urldecode($_REQUEST['query']),$_REQUEST['parent_module'],$_REQUEST['parent_type'],$_REQUEST['subpanel_id'],
-			$_REQUEST['child_id'],$_REQUEST['link_attribute'],$_REQUEST['link_type']);
+	$parent = BeanFactory::getBean($_REQUEST['module'], $_REQUEST['record']);
+	add_prospects_to_prospect_list(urldecode($_REQUEST['subpanel_module_name']),$_REQUEST['parent_module'],$_REQUEST['parent_type'],$_REQUEST['subpanel_id'],
+			$_REQUEST['child_id'],$_REQUEST['link_attribute'],$_REQUEST['link_type'], $parent);
 
 	$refreshsubpanel=false;
 }else if (isset($_REQUEST['return_type'])  && $_REQUEST['return_type'] == 'addcampaignlog') {
@@ -197,7 +208,8 @@ else {
  		$current_query_by_page_array = unserialize(base64_decode($current_query_by_page));
 
         $module = $current_query_by_page_array['module'];
- 		$seed = loadBean($module);
+        $seed = BeanFactory::getBean($module);
+        if(empty($seed)) sugar_die($GLOBALS['app_strings']['ERROR_NO_BEAN']);
  		$where_clauses = '';
  		require_once('include/SearchForm/SearchForm2.php');
 
@@ -282,4 +294,3 @@ if ($refreshsubpanel) {
 	}
 }
 exit;
-?>
diff --git a/include/generic/SugarWidgets/SugarWidget.php b/include/generic/SugarWidgets/SugarWidget.php
index 34a54678..c43c26bc 100644
--- a/include/generic/SugarWidgets/SugarWidget.php
+++ b/include/generic/SugarWidgets/SugarWidget.php
@@ -49,6 +49,7 @@ class SugarWidget
 	var $layout_manager = null;
 	var $widget_id;
     protected $form_value;
+    protected $parent_bean;
 
 	function SugarWidget(&$layout_manager)
 	{
@@ -81,6 +82,15 @@ class SugarWidget
     {
         return $this->form_value;
     }
+    function getParentBean()
+    {
+        return $this->parent_bean;
+    }
+
+    function setParentBean($parent_bean)
+    {
+        $this->parent_bean = $parent_bean;
+    }
    /**
     * getTruncatedColumnAlias
     * This function ensures that a column alias is no more than 28 characters.  Should the column_name
diff --git a/include/generic/SugarWidgets/SugarWidgetFielddate.php b/include/generic/SugarWidgets/SugarWidgetFielddate.php
index b3406810..55af51e4 100644
--- a/include/generic/SugarWidgets/SugarWidgetFielddate.php
+++ b/include/generic/SugarWidgets/SugarWidgetFielddate.php
@@ -106,4 +106,18 @@ class SugarWidgetFieldDate extends SugarWidgetFieldDateTime
         return $this->queryFilterOn($layout_def);
 	}
 
+    protected function queryMonth($layout_def, $month)
+    {
+        $end = clone($month);
+        $end->setDate($month->year, $month->month, $month->days_in_month);
+        $beginDate = $month->asDbDate();
+        $endDate = $end->asDbDate();
+        return $this->get_start_end_date_filter($layout_def, $beginDate, $endDate);
+    }
+
+    protected function now()
+    {
+        global $timedate;
+        return $timedate->tzGMT($timedate->getNow(), $this->getAssignedUser());
+    }
 }
diff --git a/include/generic/SugarWidgets/SugarWidgetFielddatetime.php b/include/generic/SugarWidgets/SugarWidgetFielddatetime.php
index 59aa16ed..25ef90ef 100644
--- a/include/generic/SugarWidgets/SugarWidgetFielddatetime.php
+++ b/include/generic/SugarWidgets/SugarWidgetFielddatetime.php
@@ -481,12 +481,14 @@ class SugarWidgetFieldDateTime extends SugarWidgetReportField
 		return parent :: querySelect($layout_def)." \n";
 	}
 	function & displayListday(& $layout_def) {
-		return parent:: displayListPlain($layout_def);
+		$value = parent:: displayListPlain($layout_def);
+		return $value;
 	}
 
 	function & displayListyear(& $layout_def) {
 		global $app_list_strings;
-    	return parent:: displayListPlain($layout_def);
+    	$value = parent:: displayListPlain($layout_def);
+    	return $value;
 	}
 
 	function displayListmonth($layout_def)
diff --git a/include/generic/SugarWidgets/SugarWidgetFieldenum.php b/include/generic/SugarWidgets/SugarWidgetFieldenum.php
index bb13a6e8..c1b8457d 100644
--- a/include/generic/SugarWidgets/SugarWidgetFieldenum.php
+++ b/include/generic/SugarWidgets/SugarWidgetFieldenum.php
@@ -42,19 +42,19 @@ class SugarWidgetFieldEnum extends SugarWidgetReportField
         parent::SugarWidgetReportField($layout_manager);
     }
 
-	public function queryFilterEmpty($layout_def)
-	{
-	    $column = $this->_get_column_select($layout_def);
-	    return "($column IS NULL OR $column LIKE '' OR $column = '^^')";
-	}
+    public function queryFilterEmpty($layout_def)
+    {
+        $column = $this->_get_column_select($layout_def);
+        return "(coalesce(" . $this->reporter->db->convert($column, "length") . ",0) = 0 OR $column = '^^')";
+    }
 
     public function queryFilterNot_Empty($layout_def)
-	{
-	    $column = $this->_get_column_select($layout_def);
-		return "( $column IS NOT NULL AND $column <> '' AND $column != '^^' )\n";
-	}
+    {
+        $column = $this->_get_column_select($layout_def);
+        return "(coalesce(" . $this->reporter->db->convert($column, "length") . ",0) > 0 AND $column != '^^' )\n";
+    }
 
-	public function queryFilteris($layout_def) {
+    public function queryFilteris($layout_def) {
 		$input_name0 = $layout_def['input_name0'];
 		if (is_array($layout_def['input_name0'])) {
 			$input_name0 = $layout_def['input_name0'][0];
diff --git a/include/generic/SugarWidgets/SugarWidgetFieldmultienum.php b/include/generic/SugarWidgets/SugarWidgetFieldmultienum.php
index a6df9d97..baeefbb8 100644
--- a/include/generic/SugarWidgets/SugarWidgetFieldmultienum.php
+++ b/include/generic/SugarWidgets/SugarWidgetFieldmultienum.php
@@ -79,15 +79,33 @@ class SugarWidgetFieldMultiEnum extends SugarWidgetFieldEnum {
     	}
 		return '('.$query.')';        
 	}
-	
-	public function queryFilteris(&$layout_def) {
+
+	public function queryFilteris($layout_def) {
 		$input_name0 = $layout_def['input_name0'];
 		if (is_array($layout_def['input_name0'])) {
 			$input_name0 = $layout_def['input_name0'][0];
 		}
-		return $this->_get_column_select($layout_def)." like '%".$GLOBALS['db']->quote($input_name0)."%'\n";
+
+		// Bug 40022
+		// IS filter doesn't add the carets (^) to multienum custom field values  
+		$input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
+		
+		return $this->_get_column_select($layout_def)." = ".$this->reporter->db->quoted($input_name0)."\n";
 	}
 
+	public function queryFilteris_not($layout_def) {
+		$input_name0 = $layout_def['input_name0'];
+		if (is_array($layout_def['input_name0'])) {
+			$input_name0 = $layout_def['input_name0'][0];
+		}
+
+		// Bug 50549
+		// IS NOT filter doesn't add the carets (^) to multienum custom field values  
+		$input_name0 = $this->encodeMultienumCustom($layout_def, $input_name0);
+		
+		return $this->_get_column_select($layout_def)." <> ".$this->reporter->db->quoted($input_name0)."\n";
+	}
+	
     /**
      * Returns an OrderBy query for multi-select. We treat multi-select the same as a normal field because
      * the values stored in the database are in the format ^A^,^B^,^C^ though not necessarily in that order.
@@ -97,6 +115,21 @@ class SugarWidgetFieldMultiEnum extends SugarWidgetFieldEnum {
     public function queryOrderBy($layout_def) {
         return SugarWidgetReportField::queryOrderBy($layout_def);
     }
+    
+    /**
+     * Function checks if the multienum field is custom, and escapes it with carets (^) if it is
+     * @param array $layout_def field layout definition
+     * @param string $value value to be escaped
+     * @return string
+     */
+    private function encodeMultienumCustom($layout_def, $value) {
+    	$field_def = $this->reporter->getFieldDefFromLayoutDef($layout_def);
+    	// Check if it is a custom field
+		if (!empty($field_def['source']) && ($field_def['source'] == 'custom_fields' || ($field_def['source'] == 'non-db' && !empty($field_def['ext2']) && !empty($field_def['id']))) && !empty($field_def['real_table']))
+		{
+			$value = encodeMultienumValue(array($value)); 
+		}
+		return $value;
+    }
 }
 ?>
-
diff --git a/include/generic/SugarWidgets/SugarWidgetFieldrelate.php b/include/generic/SugarWidgets/SugarWidgetFieldrelate.php
index b87d1272..b9c7c4fd 100644
--- a/include/generic/SugarWidgets/SugarWidgetFieldrelate.php
+++ b/include/generic/SugarWidgets/SugarWidgetFieldrelate.php
@@ -147,6 +147,10 @@ class SugarWidgetFieldRelate extends SugarWidgetReportField
 		if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
 		}
+        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        {
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
+        }
 		elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
 			$display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
 		}
@@ -161,7 +165,11 @@ class SugarWidgetFieldRelate extends SugarWidgetReportField
 
         //#31797  , we should get the table alias in a global registered array:selected_loaded_custom_links
         if(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table']])){
-            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table']]['join_table_alias'].'_name');
+        }
+        elseif(isset($field_def['rep_rel_name']) && isset($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]))
+        {
+            $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['rep_rel_name']]['join_table_alias'].'_name');
         }
         elseif(!empty($reporter->selected_loaded_custom_links) && !empty($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']])){
             $display = strtoupper($reporter->selected_loaded_custom_links[$field_def['secondary_table'].'_'.$field_def['name']]['join_table_alias'].'_name');
diff --git a/include/generic/SugarWidgets/SugarWidgetReportField.php b/include/generic/SugarWidgets/SugarWidgetReportField.php
index 8acaadc3..5d880a32 100644
--- a/include/generic/SugarWidgets/SugarWidgetReportField.php
+++ b/include/generic/SugarWidgets/SugarWidgetReportField.php
@@ -257,7 +257,7 @@ class SugarWidgetReportField extends SugarWidgetField
 
         if ( ! empty($layout_def['group_function']) && $layout_def['group_function']=='count')
         {
-                return 'count';
+                return $layout_def['table_alias'] . '__count';
         }
 
         if ( ! empty($layout_def['table_alias']))
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php b/include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php
index 1dab7416..13bcbf23 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelDetailViewLink.php
@@ -123,6 +123,10 @@ class SugarWidgetSubPanelDetailViewLink extends SugarWidgetField
 			|| ACLController::checkAccess($layout_def['owner_module'], 'view', $layout_def['owner_id'] == $current_user->id)))
         {
             $link = ajaxLink("index.php?module=$module&action=$action&record={$record}{$parent}");
+            if ($module == 'EAPM')
+            {
+                $link = "index.php?module=$module&action=$action&record={$record}{$parent}";
+            }
             return '<a href="' . $link . '" >'."$value</a>";
 
 		}else{
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php
index 8abe4007..de2a2958 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelRemoveButton.php
@@ -103,9 +103,7 @@ class SugarWidgetSubPanelRemoveButton extends SugarWidgetField
 
 		$icon_remove_text = strtolower($app_strings['LBL_ID_FF_REMOVE']);
 		
-		if($linked_field == 'get_products_query')
-			$linked_field = 'products';
-        else if($linked_field == 'get_emails_by_assign_or_link')
+         if($linked_field == 'get_emails_by_assign_or_link')
             $linked_field = 'emails';
 		//based on listview since that lets you select records
 		if($layout_def['ListView'] && !$hideremove) {
@@ -122,4 +120,3 @@ class SugarWidgetSubPanelRemoveButton extends SugarWidgetField
 		}
 	}
 }
-?>
\ No newline at end of file
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php
index 281242eb..d719c37d 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopArchiveEmailButton.php
@@ -44,10 +44,12 @@ class SugarWidgetSubPanelTopArchiveEmailButton extends SugarWidgetSubPanelTopBut
 {
 	function display($defines)
 	{
-		if(ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true)){
+		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
+			$defines['module'] == "History" & !ACLController::checkAccess("Emails", 'edit', true))){
 			$temp = '';
 			return $temp;
 		}
+		
 		global $app_strings;
 		global $mod_strings;
 		global $currentModule;
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php
index de0fb8dc..3f061bbd 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopButton.php
@@ -296,43 +296,7 @@ class SugarWidgetSubPanelTopButton extends SugarWidget
 	 */
 	function _create_json_encoded_popup_request($popup_request_data)
 	{
-		$popup_request_array = array();
-
-		if(!empty($popup_request_data['call_back_function']))
-		{
-			$popup_request_array[] = '"call_back_function":"' . $popup_request_data['call_back_function'] . '"';
-		}
-
-		if(!empty($popup_request_data['form_name']))
-		{
-			$popup_request_array[] = '"form_name":"' . $popup_request_data['form_name'] . '"';
-		}
-
-		if(!empty($popup_request_data['field_to_name_array']))
-		{
-			$field_to_name_array = array();
-			foreach($popup_request_data['field_to_name_array'] as $field => $name)
-			{
-				$field_to_name_array[] = '"' . $field . '":"' . $name . '"';
-			}
-
-			$popup_request_array[] = '"field_to_name_array":{' . implode(',', $field_to_name_array) . '}';
-		}
-
-		if(!empty($popup_request_data['passthru_data']))
-		{
-			$passthru_array = array();
-			foreach($popup_request_data['passthru_data'] as $field => $name)
-			{
-				$passthru_array[] = '"' . $field . '":"' . $name . '"';
-			}
-
-			$popup_request_array[] = '"passthru_data":{' . implode(',', $passthru_array) . '}';
-		}
-
-		$encoded_popup_request = '{' . implode(',', $popup_request_array) . '}';
-
-		return $encoded_popup_request;
+	    return json_encode($popup_request_data);
 	}
 
 	/**
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php
index 17476397..dabc05c6 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopComposeEmailButton.php
@@ -53,6 +53,12 @@ class SugarWidgetSubPanelTopComposeEmailButton extends SugarWidgetSubPanelTopBut
 
 	function display($defines)
 	{
+		if((ACLController::moduleSupportsACL($defines['module'])  && !ACLController::checkAccess($defines['module'], 'edit', true) ||
+			$defines['module'] == "Activities" & !ACLController::checkAccess("Emails", 'edit', true))){
+			$temp = '';
+			return $temp;
+		}
+		
 		global $app_strings,$current_user,$sugar_config,$beanList,$beanFiles;
 		$title = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_TITLE'];
 		//$accesskey = $app_strings['LBL_COMPOSE_EMAIL_BUTTON_KEY'];
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php
index 74f1d035..e8af0a4d 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopCreateCampaignLogEntryButton.php
@@ -59,11 +59,11 @@ class SugarWidgetSubPanelTopCreateCampaignLogEntryButton extends SugarWidgetSubP
         $this->module = 'Campaigns';//'CampaignLog';
         $this->module_name = 'Campaigns';
 
-       
-        $this->button_properties = $widget_data;        
-        
-        
-        
+
+        $this->button_properties = $widget_data;
+
+
+
         $focus = $widget_data['focus'];
         if(ACLController::moduleSupportsACL($widget_data['module']) && !ACLController::checkAccess($widget_data['module'], 'list', true)){
             $button = ' <input type="button" name="' . $this->getWidgetId() . '" id="' . $this->getWidgetId() . '" class="button"' . "\n"
@@ -105,8 +105,8 @@ class SugarWidgetSubPanelTopCreateCampaignLogEntryButton extends SugarWidgetSubP
         }
         $return_module = $_REQUEST['module'];
         $return_action = 'SubPanelViewer';
-        $return_id = $_REQUEST['record']; 
-        
+        $return_id = $_REQUEST['record'];
+
         //field_to_name_array
         $fton_array= array('id' => 'subpanel_id');
         if(isset($widget_data['field_to_name_array']) && is_array($widget_data['field_to_name_array'])){
@@ -130,18 +130,13 @@ class SugarWidgetSubPanelTopCreateCampaignLogEntryButton extends SugarWidgetSubP
 
         if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data'])) {
             $popup_request_data['passthru_data']= array_merge($popup_request_data['passthru_data'],$this->button_properties['add_to_passthru_data']);
-        }       
-        
+        }
+
         if (is_array($this->button_properties) && !empty($this->button_properties['add_to_passthru_data']['return_type'])) {
-            
+
             if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
                 $initial_filter = "&module_name=". urlencode($widget_data['module']);
             }
-            if ($this->button_properties['add_to_passthru_data']['return_type']=='addtoprospectlist') {
-                if (isset($widget_data['query'])) {
-                    $popup_request_data['passthru_data']['query']=$widget_data['query'];
-                }
-            }
         }
         $json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
         return '<form action="index.php?module=CampaignLog&action=AddCampaignLog&type=contact">' . "\n"
@@ -150,6 +145,4 @@ class SugarWidgetSubPanelTopCreateCampaignLogEntryButton extends SugarWidgetSubP
             . ' value="' . $this->value . "\"\n"
             . " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' /></form>\n";
     }
-}        
-        
-?>
+}
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php
index 5a32a75a..06b7bb03 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectButton.php
@@ -63,9 +63,9 @@ class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
 		global $app_strings;
 		$initial_filter = '';
 
-		$this->title = $app_strings['LBL_SELECT_BUTTON_TITLE'];
-		$this->accesskey = $app_strings['LBL_SELECT_BUTTON_KEY'];
-		$this->value = $this->getDisplayName();
+	    $this->title     = $this->getTitle();
+        $this->accesskey = $this->getAccesskey();
+        $this->value     = $this->getDisplayName();
 
 		if (is_array($this->button_properties)) {
 			if( isset($this->button_properties['title'])) {
@@ -157,11 +157,6 @@ class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
 			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
 				$initial_filter = "&module_name=". urlencode($widget_data['module']);
 			}
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='addtoprospectlist') {
-				if (isset($widget_data['query'])) {
-					$popup_request_data['passthru_data']['query']=$widget_data['query'];
-				}
-			}
 		}
         //acl_roles_users_selectuser_button
 
@@ -171,5 +166,22 @@ class SugarWidgetSubPanelTopSelectButton extends SugarWidgetSubPanelTopButton
 			. ' value="' . $this->value . "\"\n"
 			. " onclick='open_popup(\"$this->module_name\",600,400,\"$initial_filter\",true,true,$json_encoded_php_array,\"$popup_mode\",$create);' />\n";
 	}
+
+    /**
+    * @return string
+    */
+    protected function getTitle()
+    {
+       return translate('LBL_SELECT_BUTTON_TITLE');
+    }
+
+    /**
+    * @return string
+    */
+    protected function getAccesskey()
+    {
+       return translate('LBL_SELECT_BUTTON_KEY');
+    }
+
 }
 ?>
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php
index b309a6ca..2c81b7d3 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectContactsButton.php
@@ -161,11 +161,6 @@ class SugarWidgetSubPanelTopSelectContactsButton extends SugarWidgetSubPanelTopS
 			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
 				$initial_filter = "&module_name=". urlencode($widget_data['module']);
 			}
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='addtoprospectlist') {
-				if (isset($widget_data['query'])) {
-					$popup_request_data['passthru_data']['query']=$widget_data['query'];
-				}
-			}
 		}
 		$json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
 
diff --git a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php
index 01fdc102..8b90bb68 100644
--- a/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php
+++ b/include/generic/SugarWidgets/SugarWidgetSubPanelTopSelectUsersButton.php
@@ -165,11 +165,6 @@ class SugarWidgetSubPanelTopSelectUsersButton extends SugarWidgetSubPanelTopSele
 			if ($this->button_properties['add_to_passthru_data']['return_type']=='report') {
 				$initial_filter = "&module_name=". urlencode($widget_data['module']);
 			}
-			if ($this->button_properties['add_to_passthru_data']['return_type']=='addtoprospectlist') {
-				if (isset($widget_data['query'])) {
-					$popup_request_data['passthru_data']['query']=$widget_data['query'];
-				}
-			}
 		}
 		$json_encoded_php_array = $this->_create_json_encoded_popup_request($popup_request_data);
 
diff --git a/include/globalControlLinks.php b/include/globalControlLinks.php
index d3da6dc3..b672a7d0 100644
--- a/include/globalControlLinks.php
+++ b/include/globalControlLinks.php
@@ -68,6 +68,7 @@ $global_control_links['training'] = array(
 'linkinfo' => array($app_strings['LBL_TRAINING'] => 'javascript:void(window.open(\'http://support.sugarcrm.com\'))'),
 'submenu' => ''
  );
+
 $global_control_links['help'] = array(
     'linkinfo' => array($app_strings['LNK_HELP'] => ' javascript:void window.open(\'index.php?module=Administration&action=SupportPortal&view=documentation&version='.$sugar_version.'&edition='.$sugar_flavor.'&lang='.$current_language.'&help_module='.$GLOBALS['module'].'&help_action='.$action.'&key='.$server_unique_key.'\')'),
     'submenu' => ''
diff --git a/include/javascript/ajaxUI.js b/include/javascript/ajaxUI.js
index 5edacaca..6ce3e21c 100644
--- a/include/javascript/ajaxUI.js
+++ b/include/javascript/ajaxUI.js
@@ -74,7 +74,9 @@ else{SUGAR.ajaxUI.showLoadingPanel();ui.lastCall=YAHOO.util.Connect.asyncRequest
 SA.cleanGlobals();var form=YAHOO.util.Dom.get(formname)||document.forms[formname];if(SA.canAjaxLoadModule(form.module.value)&&typeof(YAHOO.util.Selector.query("input[type=file]",form)[0])=="undefined"&&/action=ajaxui/.exec(window.location))
 {var string=con.setForm(form);var baseUrl="index.php?action=ajaxui#ajaxUILoc=";SA.lastURL="";if(string.length>200)
 {SUGAR.ajaxUI.showLoadingPanel();form.onsubmit=function(){return true;};form.submit();}else{con.resetFormState();window.location=baseUrl+encodeURIComponent("index.php?"+string);}
-return true;}else{form.submit();return false;}},cleanGlobals:function()
+return true;}else{if(typeof(YAHOO.util.Selector.query("input[type=submit]",form)[0])!="undefined"&&YAHOO.util.Selector.query("input[type=submit]",form)[0].value=="Save")
+{ajaxStatus.showStatus(SUGAR.language.get('app_strings','LBL_SAVING'));}
+form.submit();return false;}},cleanGlobals:function()
 {sqs_objects={};QSProcessedFieldsArray={};collection={};if(SUGAR.EmailAddressWidget){SUGAR.EmailAddressWidget.instances={};SUGAR.EmailAddressWidget.count={};}
 YAHOO.util.Event.removeListener(window,'resize');if(typeof(dialog)!='undefined'&&typeof(dialog.destroy)=='function'){dialog.destroy();delete dialog;}},firstLoad:function()
 {var url=YAHOO.util.History.getBookmarkedState('ajaxUILoc');var aRegex=/action=([^&#]*)/.exec(window.location);var action=aRegex?aRegex[1]:false;var mRegex=/module=([^&#]*)/.exec(window.location);var module=mRegex?mRegex[1]:false;if(module!="ModuleBuilder")
diff --git a/include/javascript/jquery/jquery.sugarMenu.js b/include/javascript/jquery/jquery.sugarMenu.js
index 27fe5636..766735bb 100644
--- a/include/javascript/jquery/jquery.sugarMenu.js
+++ b/include/javascript/jquery/jquery.sugarMenu.js
@@ -11,7 +11,7 @@
  *          ...                             -  Elements in popout menu
  *          <li></li>                       - /
  *          <li>
- *              <a></a> or <input></input>  - element contains submenu
+ *              <input></input>  - element contains submenu
  *              <ul class="subnav-sub">     - sub-popout menu (shown when mouseover on the above element)
  *                  <li></li>               - \
  *                  ...                     -  Elements in sub-popout menu
diff --git a/include/javascript/jsclass_async.js b/include/javascript/jsclass_async.js
index 8ff3f26a..d623fa2e 100644
--- a/include/javascript/jsclass_async.js
+++ b/include/javascript/jsclass_async.js
@@ -36,7 +36,8 @@ function method_callback(o){var resp=YAHOO.lang.JSON.parse(o.responseText),reque
 reqid=global_request_registry[request_id];if(typeof(reqid)!='undefined'){widget=global_request_registry[request_id][0];method_name=global_request_registry[request_id][1];widget[method_name](result);}}
 SugarClass.inherit("SugarVCalClient","SugarClass");function SugarVCalClient(){this.init();}
 SugarVCalClient.prototype.init=function(){}
-SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;YAHOO.util.Connect.asyncRequest('GET','./vcal_server.php?type=vfb&source=outlook&user_id='+user_id,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
+SugarVCalClient.prototype.load=function(user_id,request_id){this.user_id=user_id;var vcal_server='./vcal_server.php?type=vfb&source=outlook&user_id='+user_id;if(typeof(window.combo_date_start)!='undefined'){var date_start=window.combo_date_start.datetime;vcal_server+='&datestart='+date_start;}
+YAHOO.util.Connect.asyncRequest('GET',vcal_server,{success:function(result){if(typeof GLOBAL_REGISTRY.freebusy=='undefined'){GLOBAL_REGISTRY.freebusy=new Object();}
 if(typeof GLOBAL_REGISTRY.freebusy_adjusted=='undefined'){GLOBAL_REGISTRY.freebusy_adjusted=new Object();}
 GLOBAL_REGISTRY.freebusy[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,false);GLOBAL_REGISTRY.freebusy_adjusted[user_id]=SugarVCalClient.prototype.parseResults(result.responseText,true);global_request_registry[request_id][0].display();},failure:function(result){this.success(result);},argument:{result:result}});}
 SugarVCalClient.prototype.parseResults=function(textResult,adjusted){var match=/FREEBUSY.*?\:([\w]+)\/([\w]+)/g;var result;var timehash=new Object();var dst_start;var dst_end;if(GLOBAL_REGISTRY.current_user.fields.dst_start==null)
diff --git a/include/javascript/quickCompose.js b/include/javascript/quickCompose.js
index 4b6e966a..a3b9bc6b 100644
--- a/include/javascript/quickCompose.js
+++ b/include/javascript/quickCompose.js
@@ -12,7 +12,7 @@ var theme=SUGAR.themes.theme_name;var idx=0;if(!SE.composeLayout.composeTemplate
 SE.composeLayout.composeTemplate=new YAHOO.SUGAR.Template(SE.templates['compose']);var panel_modal=dce_mode?false:true,panel_width='880px',panel_constrain=dce_mode?false:true,panel_height=dce_mode?'auto':'400px',panel_shadow=dce_mode?false:true,panel_draggable=dce_mode?false:true,panel_resize=dce_mode?false:true,panel_close=dce_mode?false:true;SQ.parentPanel=new YAHOO.widget.Panel("container1",{modal:panel_modal,visible:true,constraintoviewport:panel_constrain,width:panel_width,height:panel_height,shadow:panel_shadow,draggable:panel_draggable,resize:panel_resize,close:panel_close});if(!dce_mode){SQ.parentPanel.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_QUICK_COMPOSE'));}
 SQ.parentPanel.setBody("<div class='email'><div id='htmleditordiv"+idx+"'></div></div>");var composePanel=SE.composeLayout.getQuickComposeLayout(SQ.parentPanel,this.options);if(!dce_mode){var resize=new YAHOO.util.Resize('container1',{handles:['br'],autoRatio:false,minWidth:400,minHeight:350,status:false});resize.on('resize',function(args){var panelHeight=args.height;this.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight-50);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);},SQ.parentPanel,true);}else{SUGAR.util.doWhen("typeof SE.composeLayout[SE.composeLayout.currentInstanceId] != 'undefined'",function(){var panelHeight=400;SQ.parentPanel.cfg.setProperty("height",panelHeight+"px");var layout=SE.composeLayout[SE.composeLayout.currentInstanceId];layout.set("height",panelHeight);layout.resize(true);SE.composeLayout.resizeEditor(SE.composeLayout.currentInstanceId);});}
 YAHOO.util.Dom.setStyle("container1","z-index",1);if(!SQ.tinyLoaded)
-{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true});SQ.tinyLoaded=true;}
+{tinymce.dom.Event.domLoaded=true;tinyMCE.init({convert_urls:false,theme_advanced_toolbar_align:tinyConfig.theme_advanced_toolbar_align,valid_children:tinyConfig.valid_children,width:tinyConfig.width,theme:tinyConfig.theme,theme_advanced_toolbar_location:tinyConfig.theme_advanced_toolbar_location,theme_advanced_buttons1:tinyConfig.theme_advanced_buttons1,theme_advanced_buttons2:tinyConfig.theme_advanced_buttons2,theme_advanced_buttons3:tinyConfig.theme_advanced_buttons3,plugins:tinyConfig.plugins,elements:tinyConfig.elements,language:tinyConfig.language,extended_valid_elements:tinyConfig.extended_valid_elements,mode:tinyConfig.mode,strict_loading_mode:true});SQ.tinyLoaded=true;}
 SQ.parentPanel.show();SUGAR.email2.composeLayout.forceCloseCompose=function(o){SUGAR.quickCompose.parentPanel.hide();}
 if(!dce_mode){SQ.parentPanel.center();}},init:function(o){if(typeof o.menu_id!='undefined'){this.dceMenuPanel=o.menu_id;}else{this.dceMenuPanel=null;}
 loadingMessgPanl=new YAHOO.widget.SimpleDialog('loading',{width:'200px',close:true,modal:true,visible:true,fixedcenter:true,constraintoviewport:true,draggable:false});loadingMessgPanl.setHeader(SUGAR.language.get('app_strings','LBL_EMAIL_PERFORMING_TASK'));loadingMessgPanl.setBody(SUGAR.language.get('app_strings','LBL_EMAIL_ONE_MOMENT'));loadingMessgPanl.render(document.body);loadingMessgPanl.show();if(!SUGAR.quickCompose.resourcesLoaded)
diff --git a/include/javascript/sugar_3.js b/include/javascript/sugar_3.js
index 0465ae74..8e12e681 100644
--- a/include/javascript/sugar_3.js
+++ b/include/javascript/sugar_3.js
@@ -224,7 +224,7 @@ else if(document.documentElement&&document.documentElement.scrollTop)
 {nwX=document.documentElement.scrollLeft;seX=document.documentElement.clientWidth;nwY=document.documentElement.scrollTop;seY=document.documentElement.clientHeight;}
 else if(document.body)
 {nwX=document.body.scrollLeft;seX=document.body.clientWidth;nwY=document.body.scrollTop;seY=document.body.clientHeight;}
-var inView=true;for(var wp=0;wp<inputsWithErrors.length;wp++){var elementCoor=findElementPos(inputsWithErrors[wp]);if(!(elementCoor.x>=nwX&&elementCoor.y>=nwY&&elementCoor.x<=seX&&elementCoor.y<=seY)){inView=false;scrollToTop=elementCoor.y-75;scrollToLeft=elementCoor.x-75;}
+var inView=true;for(var wp=0;wp<inputsWithErrors.length;wp++){var elementCoor=findElementPos(inputsWithErrors[wp]);if(!(elementCoor.x>=nwX&&elementCoor.y>=nwY&&elementCoor.x<=seX+nwX&&elementCoor.y<=seY+nwY)){inView=false;scrollToTop=elementCoor.y-75;scrollToLeft=elementCoor.x-75;}
 else{break;}}
 if(!inView)window.scrollTo(scrollToLeft,scrollToTop);return false;}
 disableOnUnloadEditView(form);return true;}
@@ -512,6 +512,7 @@ selectedIndex=nodeCount;}}
 document.getElementById('orderBySelect').selectedIndex=selectedIndex;};SUGAR.tabChooser.movementCallback(document.getElementById('display_tabs_td').getElementsByTagName('select')[0]);if(document.search_form.orderBy)
 document.search_form.orderBy.options.value=SUGAR.savedViews.selectedOrderBy;if(SUGAR.savedViews.selectedSortOrder=='DESC')document.getElementById('sort_order_desc_radio').checked=true;else document.getElementById('sort_order_asc_radio').checked=true;}};}();SUGAR.searchForm=function(){var url;return{searchFormSelect:function(view,previousView){var module=view.split('|')[0];var theView=view.split('|')[1];var handleDisplay=function(){document.search_form.searchFormTab.value=theView;patt=module+"(.*)SearchForm$";divId=document.search_form.getElementsByTagName('div');for(i=0;i<divId.length;i++){if(divId[i].id.match(module)==module){if(divId[i].id.match('SearchForm')=='SearchForm'){if(document.getElementById(divId[i].id).style.display==''){previousTab=divId[i].id.match(patt)[1];}
 document.getElementById(divId[i].id).style.display='none';}}}
+adv=document.getElementById('advanced_search_link');bas=document.getElementById('basic_search_link');adv.setAttribute('accesskey','');bas.setAttribute('accesskey','');a_key=SUGAR.language.get("app_strings","LBL_ADV_SEARCH_LNK_KEY");if(theView==='advanced_search'){bas.setAttribute('accesskey',a_key);}else{adv.setAttribute('accesskey',a_key);}
 document.getElementById(module+theView+'SearchForm').style.display='';if(previousView){thepreviousView=previousView.split('|')[1];}
 else{thepreviousView=previousTab;}
 thepreviousView=thepreviousView.replace(/_search/,"");for(num in document.search_form.elements){if(document.search_form.elements[num]){el=document.search_form.elements[num];pattern="^(.*)_"+thepreviousView+"$";if(typeof el.type!='undefined'&&typeof el.name!='undefined'&&el.name.match(pattern)){advanced_input_name=el.name.match(pattern)[1];advanced_input_name=advanced_input_name+"_"+theView.replace(/_search/,"");if(typeof document.search_form[advanced_input_name]!='undefined')
@@ -525,7 +526,8 @@ else{handleDisplay();}},copyElement:function(inputName,copyFromElement){switch(c
 if(typeof(elem.type)!='undefined'&&typeof(skipElementNames)!='undefined'&&SUGAR.util.arrayIndexOf(skipElementNames,elem.name)!=-1)
 {continue;}
 elemType=elem.type.toLowerCase();if(elemType=='text'||elemType=='textarea'||elemType=='password'){elem.value='';}
-else if(elemType=='select'||elemType=='select-one'||elemType=='select-multiple'){var optionList=elem.options;for(var ii=0;ii<optionList.length;ii++){optionList[ii].selected=false;}}
+else if(elemType=='select'||elemType=='select-one'||elemType=='select-multiple'){var optionList=elem.options;if(optionList.length>0){optionList[0].selected="selected";}
+for(var ii=0;ii<optionList.length;ii++){optionList[ii].selected=false;}}
 else if(elemType=='radio'||elemType=='checkbox'){elem.checked=false;elem.selected=false;}
 else if(elemType=='hidden'){if((elem.name.length>3&&elem.name.substring(elem.name.length-3)=='_id')||((elem.name.length>9)&&(elem.name.substring(elem.name.length-9)=='_id_basic'))||(elem.name.length>12&&elem.name.substring(elem.name.length-12)=='_id_advanced')||(elem.name.length>2&&elem.name.substring(elem.name.length-2)=='_c')||((elem.name.length>8)&&(elem.name.substring(elem.name.length-8)=='_c_basic'))||(elem.name.length>11&&elem.name.substring(elem.name.length-11)=='_c_advanced'))
 {elem.value='';}}}
@@ -596,11 +598,11 @@ popupCount=1;window.document.popup_request_data=popup_request_data;window.docume
 popupCount++;if(hide_clear_button){URL+='&hide_clear_button=true';}
 windowFeatures='width='+width
 +',height='+height
-+',resizable=1,scrollbars=1';if(popup_mode==''&&popup_mode=='undefined'){popup_mode='single';}
-URL+='&mode='+popup_mode;if(create==''&&create=='undefined'){create='false';}
-URL+='&create='+create;if(metadata!=''&&metadata!='undefined'){URL+='&metadata='+metadata;}
++',resizable=1,scrollbars=1';if(popup_mode==''||popup_mode==undefined){popup_mode='single';}
+URL+='&mode='+popup_mode;if(create==''||create==undefined){create='false';}
+URL+='&create='+create;if(metadata!=''&&metadata!=undefined){URL+='&metadata='+metadata;}
 if(popup_request_data.jsonObject){var request_data=popup_request_data.jsonObject;}else{var request_data=popup_request_data;}
-var field_to_name_array_url='';if(request_data&&request_data.field_to_name_array!='undefined'){for(var key in request_data.field_to_name_array){if(key.toLowerCase()!='id'){field_to_name_array_url+='&field_to_name[]='+encodeURIComponent(key.toLowerCase());}}}
+var field_to_name_array_url='';if(request_data&&request_data.field_to_name_array!=undefined){for(var key in request_data.field_to_name_array){if(key.toLowerCase()!='id'){field_to_name_array_url+='&field_to_name[]='+encodeURIComponent(key.toLowerCase());}}}
 if(field_to_name_array_url){URL+=field_to_name_array_url;}
 win=SUGAR.util.openWindow(URL,windowName,windowFeatures);if(window.focus)
 {win.focus();}
diff --git a/include/language/en_us.lang.php b/include/language/en_us.lang.php
index e89e2af7..0a2abba3 100644
--- a/include/language/en_us.lang.php
+++ b/include/language/en_us.lang.php
@@ -1831,6 +1831,7 @@ $app_strings = array (
     'LBL_OPT_OUT_FLAG_PRIMARY' => 'Opt out Primary Email',
     'LBL_MEETINGS'=>'Meetings',
     'LBL_MEETING'=>'Meeting',
+    'LBL_MEETING_GO_BACK'=>'Go back to the meeting',
     'LBL_MEMBERS'=>'Members',
     'LBL_MEMBER_OF'=>'Member Of',
     'LBL_MODIFIED_BY_USER'=>'Modified by User',
@@ -1910,6 +1911,8 @@ $app_strings = array (
     'LBL_SEARCH_BUTTON_LABEL' => 'Search',
     'LBL_SEARCH_BUTTON_TITLE' => 'Search',
     'LBL_SEARCH' => 'Search',
+    'LBL_SEARCH_TIPS' => "Press the search button or click enter to get an exact match for them.",
+    'LBL_SEARCH_TIPS_2' => "Press the search button or click enter to get an exact match for",
     'LBL_SEARCH_MORE' => 'more',
     'LBL_SEE_ALL' => 'See All',
     'LBL_UPLOAD_IMAGE_FILE_INVALID' => 'Invalid file format, only image file can be uploaded.',
@@ -2014,7 +2017,7 @@ $app_strings = array (
     'LBL_TABGROUP_ALL' => 'All',
     'LBL_TABGROUP_ACTIVITIES' => 'Activities',
     'LBL_TABGROUP_COLLABORATION' => 'Collaboration',
-    'LBL_TABGROUP_HOME' => 'Home',
+    'LBL_TABGROUP_HOME' => 'Dashboard',
     'LBL_TABGROUP_MARKETING' => 'Marketing',
     'LBL_TABGROUP_MY_PORTALS' => 'My Sites',
     'LBL_TABGROUP_OTHER' => 'Other',
@@ -2105,6 +2108,7 @@ $app_strings = array (
     'WARN_UNSAVED_CHANGES'=> "You are about to leave this record without saving any changes you may have made to the record. Are you sure you want to navigate away from this record?",
     'ERROR_NO_RECORD' => 'Error retrieving record.  This record may be deleted or you may not be authorized to view it.',
     'ERROR_TYPE_NOT_VALID' => 'Error. This type is not valid.',
+    'ERROR_NO_BEAN' => 'Failed to get bean.', 
     'LBL_DUP_MERGE'=>'Find Duplicates',
     'LBL_MANAGE_SUBSCRIPTIONS'=>'Manage Subscriptions',
     'LBL_MANAGE_SUBSCRIPTIONS_FOR'=>'Manage Subscriptions for ',
@@ -2463,6 +2467,8 @@ $app_strings = array (
     'UPLOAD_ERROR_TEXT'          => 'ERROR: There was an error during upload. Error code: {0} - {1}',
     'UPLOAD_ERROR_TEXT_SIZEINFO' => 'ERROR: There was an error during upload. Error code: {0} - {1}. The upload_maxsize is {2} ',
     'UPLOAD_ERROR_HOME_TEXT'     => 'ERROR: There was an error during your upload, please contact an administrator for help.',
+    'UPLOAD_MAXIMUM_EXCEEDED'    => 'Size of Upload ({0} bytes) Exceeded Allowed Maximum: {1} bytes',
+
 
     //508 used Access Keys
     'LBL_EDIT_BUTTON_KEY' => 'i',
@@ -2488,6 +2494,7 @@ $app_strings = array (
     'LBL_KEYBOARD_SHORTCUTS_HELP' => '<p><strong>Form Functionality - Alt+</strong><br/> I = ed<b>I</b>t (detailview)<br/> U = d<b>U</b>plicate (detailview)<br/> D = <b>D</b>elete (detailview)<br/> A = s<b>A</b>ve (editview)<br/> L = cance<b>L</b> (editview) <br/><br/></p><p><strong>Search and Navigation  - Alt+</strong><br/> 7 = first input on Edit form<br/> 8 = Advanced Search link<br/> 9 = First Search Form input<br/> 0 = Unified search input<br></p>' ,
 
     'ERR_CONNECTOR_NOT_ARRAY' => 'connector array in {0} been defined incorrectly or is empty and could not be used.',
+    'ERR_SUHOSIN' => 'Upload stream is blocked by Suhosin, please add &quot;upload&quot; to suhosin.executor.include.whitelist (See sugarcrm.log for more information)',
     );
 
 $app_list_strings['moduleList']['Library'] = 'Library';
diff --git a/include/modules.php b/include/modules.php
index 937edfc5..4f9ca0a2 100644
--- a/include/modules.php
+++ b/include/modules.php
@@ -311,7 +311,6 @@ $modInvisList[] = 'OAuthTokens';
 $objectList = array();
 $objectList['Cases'] =  'Case';
 $objectList['Groups'] =  'User';
-$objectList['Schedulers'] =  'schedulers';
 $objectList['Users'] =  'User';
 
 if (file_exists('include/modules_override.php'))
diff --git a/include/php-sql-parser.php b/include/php-sql-parser.php
index 5859d7b1..85f66934 100644
--- a/include/php-sql-parser.php
+++ b/include/php-sql-parser.php
@@ -917,7 +917,7 @@ EOREGEX
 						}
 
 						if(substr(trim($table),0,1) == '(') {
-							$base_expr=$this->trimSubquery(trim);
+							$base_expr=$this->trimSubquery($table);
 							$join_type = 'JOIN';
 							$sub_tree = $this->process_from($this->split_sql($base_expr));
 							$alias="";
diff --git a/include/upload_file.php b/include/upload_file.php
index 5aca43fa..cec1b5c7 100644
--- a/include/upload_file.php
+++ b/include/upload_file.php
@@ -507,6 +507,74 @@ class UploadStream
     const STREAM_NAME = "upload";
     protected static $upload_dir;
 
+    /**
+     * Method checks Suhosin restrictions to use streams in php
+     *
+     * @static
+     * @return bool is allowed stream or not
+     */
+    public static function getSuhosinStatus()
+    {
+        // looks like suhosin patch doesn't block protocols, only suhosin extension (tested on FreeBSD)
+        // if suhosin is not installed it is okay for us
+        if (extension_loaded('suhosin') == false)
+        {
+            return true;
+        }
+        $configuration = ini_get_all('suhosin', false);
+
+        // suhosin simulation is okay for us
+        if ($configuration['suhosin.simulation'] == true)
+        {
+            return true;
+        }
+
+        // checking that UploadStream::STREAM_NAME is allowed by white list
+        $streams = $configuration['suhosin.executor.include.whitelist'];
+        if ($streams != '')
+        {
+            $streams = explode(',', $streams);
+            foreach($streams as $stream)
+            {
+                $stream = explode('://', $stream, 2);
+                if (count($stream) == 1)
+                {
+                    if ($stream[0] == UploadStream::STREAM_NAME)
+                    {
+                        return true;
+                    }
+                }
+                elseif ($stream[1] == '' && $stream[0] == UploadStream::STREAM_NAME)
+                {
+                    return true;
+                }
+            }
+
+            $GLOBALS['log']->fatal('Stream ' . UploadStream::STREAM_NAME . ' is not listed in suhosin.executor.include.whitelist and blocked because of it');
+            return false;
+        }
+
+        // checking that UploadStream::STREAM_NAME is not blocked by black list
+        $streams = $configuration['suhosin.executor.include.blacklist'];
+        if ($streams != '')
+        {
+            $streams = explode(',', $streams);
+            foreach($streams as $stream)
+            {
+                $stream = explode('://', $stream, 2);
+                if ($stream[0] == UploadStream::STREAM_NAME)
+                {
+                    $GLOBALS['log']->fatal('Stream ' . UploadStream::STREAM_NAME . 'is listed in suhosin.executor.include.blacklist and blocked because of it');
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        $GLOBALS['log']->fatal('Suhosin blocks all streams, please define ' . UploadStream::STREAM_NAME . ' stream in suhosin.executor.include.whitelist');
+        return false;
+    }
+
     /**
      * Get upload directory
      * @return string
diff --git a/include/utils.php b/include/utils.php
index 927920f0..10370f14 100644
--- a/include/utils.php
+++ b/include/utils.php
@@ -218,6 +218,8 @@ function make_sugar_config(&$sugar_config)
 		    'min_retry_interval' => 60, // minimal job retry delay
 		    'max_retries' => 5, // how many times to retry the job
 		    'timeout' => 86400, // how long a job may spend as running before being force-failed
+		    'soft_lifetime' => 7, // how many days until job record will be soft deleted after completion
+		    'hard_lifetime' => 21, // how many days until job record will be purged from DB
 		),
 		"cron" => array(
 			'max_cron_jobs' => 10, // max jobs per cron schedule run
@@ -973,7 +975,8 @@ function return_application_language($language)
 	}
 
 	// If we are in debug mode for translating, turn on the prefix now!
-	if($sugar_config['translation_string_prefix']) {
+    if(!empty($sugar_config['translation_string_prefix']))
+    {
 		foreach($app_strings as $entry_key=>$entry_value) {
 			$app_strings[$entry_key] = $language.' '.$entry_value;
 		}
@@ -2393,7 +2396,7 @@ function get_emails_by_assign_or_link($params)
     	'join_table_link_alias' => 'linkt',
     ));
     $rel_join = str_replace("{$bean->table_name}.id", "'{$bean->id}'", $rel_join);
-    $return_array['select']='SELECT emails.id ';
+    $return_array['select']='SELECT DISTINCT emails.id ';
     $return_array['from'] = "FROM emails ";
     $return_array['join'] = " INNER JOIN (".
         // directly assigned emails
@@ -3792,12 +3795,13 @@ function getTrackerSubstring($name) {
 	}
 
 	if($strlen > $max_tracker_item_length) {
-		$chopped = function_exists('mb_substr') ? mb_substr($name, 0, $max_tracker_item_length, "UTF-8") : substr($name, 0, $max_tracker_item_length);
+		$chopped = function_exists('mb_substr') ? mb_substr($name, 0, $max_tracker_item_length-3, "UTF-8") : substr($name, 0, $max_tracker_item_length-3);
+		$chopped .= "...";
 	} else {
 		$chopped = $name;
 	}
 
-	return $chopped;
+	return to_html($chopped);
 }
 function generate_search_where ($field_list=array(),$values=array(),&$bean,$add_custom_fields=false,$module='') {
 	$where_clauses= array();
@@ -4516,7 +4520,8 @@ function verify_image_file($path, $jpeg = false)
             if(file_put_contents($path, $image)) {
                 return true;
             }
-        } elseif ($filetype == "image/png") { // else if the filetype is png, create png
+        } elseif ($filetype == "image/png") {
+            // else if the filetype is png, create png
         	imagealphablending($img, true);
         	imagesavealpha($img, true);
         	ob_start();
@@ -4551,7 +4556,7 @@ function verify_image_file($path, $jpeg = false)
 
 /**
  * Verify uploaded image
- * Verifies that image has proper extension, MIME type and doesn't contain hostile contant
+ * Verifies that image has proper extension, MIME type and doesn't contain hostile content
  * @param string $path  Image path
  * @param bool $jpeg_only  Accept only JPEGs?
  */
@@ -4569,7 +4574,7 @@ function verify_uploaded_image($path, $jpeg_only = false)
 	$img_size = getimagesize($path);
 	$filetype = $img_size['mime'];
 	$ext = end(explode(".", $path));
-	if(substr_count('..', $path) > 0 || ($ext !== $path && !in_array(strtolower($ext), array_keys($supportedExtensions))) ||
+	if(substr_count('..', $path) > 0 || ($ext !== $path && !isset($supportedExtensions[strtolower($ext)])) ||
 	    !in_array($filetype, array_values($supportedExtensions))) {
 	        return false;
 	}
@@ -4796,3 +4801,76 @@ function generateETagHeader($etag){
 		}
 	}
 }
+
+/**
+ * isSearchEngineDown
+ *
+ * This function checks the existence of a cache file
+ *
+ * @return boolean true if file found, false otherwise
+ */
+function isSearchEngineDown()
+{
+    $cacheDir = empty($GLOBALS['sugar_config']['cache_dir']) ? 'cache/' : $GLOBALS['sugar_config']['cache_dir'];
+    if (file_exists($cacheDir.'fts/fts_down'))
+    {
+        return true;
+    }
+    return false;
+}
+
+/**
+ * searchEngineDown
+ *
+ * This function creates a cache file to indicate search engine is down
+ *
+ */
+function searchEngineDown()
+{
+    $cacheDir = create_cache_directory('fts/');
+    sugar_touch($cacheDir.'/fts_down');
+}
+
+/**
+ * restoreSearchEngine
+ *
+ * This function removes the cache file to indicate search engine has been restored
+ *
+ */
+function restoreSearchEngine()
+{
+    $cacheDir = empty($GLOBALS['sugar_config']['cache_dir']) ? 'cache/' : $GLOBALS['sugar_config']['cache_dir'];
+    $down_file = $cacheDir.'fts/fts_down';
+    if (file_exists($down_file))
+    {
+        unlink($down_file);
+    }
+}
+
+/**
+ * getReportNameTranslation
+ *
+ * Translates the report name if a translation exists,
+ * otherwise just returns the name
+ *
+ * @param string $reportName
+ * @return string translated report name
+ */
+function getReportNameTranslation($reportName) {
+	global $current_language;
+
+	// Used for translating reports
+    $mod_strings = return_module_language($current_language, 'Reports');
+
+	// Search for the report name in the default language and get the key
+	$key = array_search($reportName, return_module_language("", "Reports"));
+
+	// If the key was found, use it to get a translation, otherwise just use report name
+	if (!empty($key)) {
+		$title = $mod_strings[$key];
+	} else {
+		$title = $reportName;
+	}
+
+	return $title;
+}
diff --git a/include/utils/autoloader.php b/include/utils/autoloader.php
index d611c73b..b0f9a72a 100644
--- a/include/utils/autoloader.php
+++ b/include/utils/autoloader.php
@@ -42,7 +42,7 @@ class SugarAutoLoader{
 		'Sugar_Smarty'=>'include/Sugar_Smarty.php',
 		'Javascript'=>'include/javascript/javascript.php',
         'SugarSearchEngineFullIndexer'=>'include/SugarSearchEngine/SugarSearchEngineFullIndexer.php',
-
+        'SugarSearchEngineSyncIndexer'=>'include/SugarSearchEngine/SugarSearchEngineSyncIndexer.php',
 	);
 
 	public static $noAutoLoad = array(
diff --git a/include/utils/file_utils.php b/include/utils/file_utils.php
index 171444ff..55af5c01 100644
--- a/include/utils/file_utils.php
+++ b/include/utils/file_utils.php
@@ -462,3 +462,14 @@ function cleanFileName($name)
 {
     return preg_replace('/[^\w-._]+/i', '', $name);
 }
+
+/**
+ * Filter dir name to not contain path components - no slashes, no .., etc.
+ * @param string $name
+ * @return string
+ */
+function cleanDirName($name)
+{
+    return str_replace(array("\\", "/", "."), "", $name);
+}
+
diff --git a/include/utils/security_utils.php b/include/utils/security_utils.php
index c9951591..b1b36a91 100644
--- a/include/utils/security_utils.php
+++ b/include/utils/security_utils.php
@@ -49,7 +49,7 @@ $modules_exempt_from_availability_check['History']='History';
 $modules_exempt_from_availability_check['Calls']='Calls';
 $modules_exempt_from_availability_check['Meetings']='Meetings';
 $modules_exempt_from_availability_check['Tasks']='Tasks';
-$modules_exempt_from_availability_check['Notes']='Notes';
+//$modules_exempt_from_availability_check['Notes']='Notes';
 
 $modules_exempt_from_availability_check['CampaignLog']='CampaignLog';
 $modules_exempt_from_availability_check['CampaignTrackers']='CampaignTrackers';
diff --git a/include/utils/sugar_file_utils.php b/include/utils/sugar_file_utils.php
index ff0ffc8d..450a8163 100644
--- a/include/utils/sugar_file_utils.php
+++ b/include/utils/sugar_file_utils.php
@@ -177,9 +177,15 @@ function sugar_file_put_contents_atomic($filename, $data, $mode='wb', $use_inclu
     fwrite($f, $data);
     fclose($f);
 
-    if (!@rename($temp, $filename)) {
+    if (!@rename($temp, $filename))
+    {
         @unlink($filename);
-        @rename($temp, $filename);
+        if (!@rename($temp, $filename))
+        {
+            // cleaning up temp file to avoid filling up temp dir
+            @unlink($temp);
+            trigger_error("sugar_file_put_contents_atomic() : fatal rename failure '$temp' -> '$filename'", E_USER_ERROR);
+        }
     }
 
     if(file_exists($filename))
diff --git a/install/confirmSettings.php b/install/confirmSettings.php
index fb4d8d9f..ea52fa45 100644
--- a/install/confirmSettings.php
+++ b/install/confirmSettings.php
@@ -37,7 +37,12 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 
 
-global $sugar_config,$db;
+global $sugar_config, $db, $app_strings;
+if (isset($sugar_config['default_language']) == false)
+{
+    $sugar_config['default_language'] = $GLOBALS['current_language'];
+}
+$app_strings = return_application_language($GLOBALS['current_language']);
 
 if( !isset( $install_script ) || !$install_script ){
     die($mod_strings['ERR_NO_DIRECT_SCRIPT']);
@@ -454,7 +459,22 @@ if( $memory_limit == "" ){          // memory_limit disabled at compile time, no
             <td  >'.$spriteSupportStatus.'</td>
           </tr>';
 
-
+        // Suhosin allow to use upload://
+        if (UploadStream::getSuhosinStatus() == true || (strpos(ini_get('suhosin.perdir'), 'e') !== false && strpos($_SERVER["SERVER_SOFTWARE"],'Microsoft-IIS') === false))
+        {
+            $suhosinStatus = "{$mod_strings['LBL_CHECKSYS_OK']}";
+        }
+        else
+        {
+            $suhosinStatus = "<span class='stop'><b>{$app_strings['ERR_SUHOSIN']}</b></span>";
+        }
+        $envString .= '
+        <tr>
+            <td></td>
+            <td><strong>PHP allows to use stream (' . UploadStream::STREAM_NAME . '://)</strong></td>
+            <td>' . $suhosinStatus . '</td>
+        </tr>
+        ';
 
 // PHP.ini
 $phpIniLocation = get_cfg_var("cfg_file_path");
@@ -592,5 +612,3 @@ function togglePass(){
 
 EOQ;
 echo $out;
-
-?>
diff --git a/install/install_utils.php b/install/install_utils.php
index db0a76f5..536b28c3 100644
--- a/install/install_utils.php
+++ b/install/install_utils.php
@@ -891,6 +891,13 @@ $contents = '';
 $restrict_str = <<<EOQ
 
 # BEGIN SUGARCRM RESTRICTIONS
+
+EOQ;
+if (ini_get('suhosin.perdir') !== false && strpos(ini_get('suhosin.perdir'), 'e') !== false)
+{
+    $restrict_str .= "php_value suhosin.executor.include.whitelist upload\n";
+}
+$restrict_str .= <<<EOQ
 RedirectMatch 403 {$ignoreCase}.*\.log$
 RedirectMatch 403 {$ignoreCase}/+not_imported_.*\.txt
 RedirectMatch 403 {$ignoreCase}/+(soap|cache|xtemplate|data|examples|include|log4php|metadata|modules)/+.*\.(php|tpl)
@@ -1097,6 +1104,9 @@ function create_default_users(){
     $user->email = '';
     $user->picture = UserDemoData::_copy_user_image($user->id);
     $user->save();
+    //Bug#53793: Keep default current user in the global variable in order to store 'created_by' info as default user
+    //           while installation is proceed.
+    $GLOBALS['current_user'] = $user;
 
 
     if( $create_default_user ){
diff --git a/install/language/en_us.lang.php b/install/language/en_us.lang.php
index 1ba6c8ec..392bd128 100644
--- a/install/language/en_us.lang.php
+++ b/install/language/en_us.lang.php
@@ -528,6 +528,7 @@ $mod_strings = array(
     'LBL_OOTB_TRACKER'		=> 'Prune tracker tables',
     'LBL_OOTB_SEND_EMAIL_REMINDERS'	=> 'Run Email Reminder Notifications',
     'LBL_UPDATE_TRACKER_SESSIONS' => 'Update tracker_sessions table',
+    'LBL_OOTB_CLEANUP_QUEUE' => 'Clean Jobs Queue',
 
 
     'LBL_PATCHES_TITLE'     => 'Install Latest Patches',
diff --git a/json_server.php b/json_server.php
index bc577477..b639db4b 100644
--- a/json_server.php
+++ b/json_server.php
@@ -259,16 +259,16 @@ function construct_where(&$query_obj, $table='',$module=null) {
 		}
 		else {
 			if($condition['op'] == 'contains') {
-				$cond_arr[] = $GLOBALS['db']->quote($table.$condition['name'])." like '%".$GLOBALS['db']->quote($condition['value'])."%'";
+				$cond_arr[] = $table.$GLOBALS['db']->getValidDBName($condition['name'])." like '%".$GLOBALS['db']->quote($condition['value'])."%'";
 			}
 			if($condition['op'] == 'like_custom') {
 				$like = '';
 				if(!empty($condition['begin'])) $like .= $GLOBALS['db']->quote($condition['begin']);
 				$like .= $GLOBALS['db']->quote($condition['value']);
 				if(!empty($condition['end'])) $like .= $GLOBALS['db']->quote($condition['end']);
-				$cond_arr[] = $GLOBALS['db']->quote($table.$condition['name'])." like '$like'";
+				$cond_arr[] = $table.$GLOBALS['db']->getValidDBName($condition['name'])." like '$like'";
 			} else { // starts_with
-				$cond_arr[] = $GLOBALS['db']->quote($table.$condition['name'])." like '".$GLOBALS['db']->quote($condition['value'])."%'";
+				$cond_arr[] = $table.$GLOBALS['db']->getValidDBName($condition['name'])." like '".$GLOBALS['db']->quote($condition['value'])."%'";
 			}
 		}
 	}
diff --git a/jssource/JSGroupings.php b/jssource/JSGroupings.php
index 69cdffac..d50bf655 100644
--- a/jssource/JSGroupings.php
+++ b/jssource/JSGroupings.php
@@ -56,7 +56,6 @@
                 'include/javascript/quickCompose.js'    => 'include/javascript/sugar_grp1.js',
                 'include/javascript/yui/build/yuiloader/yuiloader-min.js' => 'include/javascript/sugar_grp1.js',
                 //HTML decode
-                'include/javascript/phpjs/license.js' => 'include/javascript/sugar_grp1.js',
                 'include/javascript/phpjs/get_html_translation_table.js' => 'include/javascript/sugar_grp1.js',
                 'include/javascript/phpjs/html_entity_decode.js' => 'include/javascript/sugar_grp1.js',
                 'include/javascript/phpjs/htmlentities.js' => 'include/javascript/sugar_grp1.js',
diff --git a/jssource/src_files/include/SubPanel/SubPanelTiles.js b/jssource/src_files/include/SubPanel/SubPanelTiles.js
index 31e1b00d..1f2602e7 100644
--- a/jssource/src_files/include/SubPanel/SubPanelTiles.js
+++ b/jssource/src_files/include/SubPanel/SubPanelTiles.js
@@ -206,7 +206,13 @@ function set_return_and_save_background(popup_reply_data)
 
 	var returnstuff = http_fetch_sync('index.php',query_string);
 	request_id++;
- 	got_data(returnstuff, true);
+
+	// Bug 52843
+	// If returnstuff.responseText is empty, don't process, because it will blank the innerHTML
+	if (typeof returnstuff != 'undefined' && typeof returnstuff.responseText != 'undefined' && returnstuff.responseText.length != 0) {
+		got_data(returnstuff, true);
+	}
+	
  	if(refresh_page == 1){
  		document.location.reload(true);
  	}
diff --git a/jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js b/jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js
index 5ebd1a12..17ee7716 100644
--- a/jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js
+++ b/jssource/src_files/include/SugarCharts/Jit/js/sugarCharts.js
@@ -72,6 +72,39 @@ function loadSugarChart (chartId,jsonFilename,css,chartConfig) {
 
 				var properties = $jit.util.splat(json.properties)[0];	
 				var marginBottom = (chartConfig["orientation"] == 'vertical' && json.values.length > 8) ? 20*4 : 20;
+
+                 // Bug #49732 : Bars in charts overlapping
+                // if to many data to display fix canvas width and set up width to container to allow overflow
+                if ( chartConfig["orientation"] == 'vertical' )
+                {
+                    function fixChartContainer(event, itemsCount)
+                    {
+                        var region = YAHOO.util.Dom.getRegion('content');
+                        if ( region && region.width )
+                        {
+                            // one bar needs about 40 px to correct display data and labels
+                            var realWidth = itemsCount * 40;
+                            if ( realWidth > region.width )
+                            {
+                                var chartCanvas = YAHOO.util.Dom.getElementsByClassName('chartCanvas', 'div');
+                                var chartContainer = YAHOO.util.Dom.getElementsByClassName('chartContainer', 'div');
+                                if ( chartContainer.length > 0 && chartCanvas.length > 0 )
+                                {
+                                    chartContainer = YAHOO.util.Dom.get(chartContainer[0])
+                                    YAHOO.util.Dom.setStyle(chartContainer, 'width', region.width+'px')
+                                    chartCanvas = YAHOO.util.Dom.get(chartCanvas[0]);
+                                    YAHOO.util.Dom.setStyle(chartCanvas, 'width', realWidth+'px');
+                                    if (!event)
+                                    {
+                                        YAHOO.util.Event.addListener(window, "resize", fixChartContainer, json.values.length);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    fixChartContainer(null, json.values.length);
+                }
+
 				//init BarChart
 				var barChart = new $jit.BarChart({
 				  //id of the visualization container
diff --git a/jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js b/jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
index 3640f22f..d18e4b05 100644
--- a/jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
+++ b/jssource/src_files/include/SugarFields/Fields/Datetimecombo/Datetimecombo.js
@@ -87,7 +87,7 @@ function Datetimecombo (datetime, field, timeformat, tabindex, showCheckbox, che
     this.datetime = this.datetime.substr(0,10);
     this.showCheckbox = showCheckbox;
     this.checked = parseInt(checked);
-    document.getElementById(this.fieldname + '_date').value = this.datetime;
+    YAHOO.util.Selector.query('input#' + this.fieldname + '_date')[0].value = this.datetime;
 
     //A safety scan to make sure hrs and minutes are formatted correctly
 	if (this.mins > 0 && this.mins < 15) {
@@ -140,17 +140,17 @@ Datetimecombo.prototype.jsscript = function(callback) {
 	text += '\ncalendar.hide();';
 	text += '\n}'
 	*/
-    text += '\nd = document.getElementById("' + this.fieldname + '_date").value;';
-    text += '\nh = document.getElementById("' + this.fieldname + '_hours").value;';
-    text += '\nm = document.getElementById("' + this.fieldname + '_minutes").value;';
+    text += '\nd = YAHOO.util.Selector.query("input#' + this.fieldname + '_date")[0].value;';
+    text += '\nh = YAHOO.util.Selector.query("select#' + this.fieldname + '_hours")[0].value;';
+    text += '\nm = YAHOO.util.Selector.query("select#' + this.fieldname + '_minutes")[0].value;';
     text += '\nnewdate = d + " " + h + "' + this.timeseparator + '" + m;';
     if(this.hasMeridiem) {
-       text += '\nif(typeof document.getElementById("' + this.fieldname + '_meridiem") != "undefined") {';
-       text += '\n   newdate += document.getElementById("' + this.fieldname + '_meridiem").value;';
-       text += '\n}';
+        text += '\nif(typeof YAHOO.util.Selector.query("select#' + this.fieldname + '_meridiem")[0] != "undefined") {';
+        text += '\n   newdate += YAHOO.util.Selector.query("select#' + this.fieldname + '_meridiem")[0].value;';
+        text += '\n}';
     }
     text += '\nif(trim(newdate) =="'+ this.timeseparator +'") newdate="";';
-    text += '\ndocument.getElementById("' + this.fieldname + '").value = newdate;';
+    text += '\nYAHOO.util.Selector.query("select#' + this.fieldname + '")[0].value = newdate;';
     text += '\n' + callback;
     text += '\n}';
     //text += '\n</script>';
@@ -222,12 +222,12 @@ Datetimecombo.prototype.update = function(updateListeners) {
 
 	// Bug 42025: hour/minute/second still required when start_date is non required
 	//			  Fixing this by just assigning default when they aren't required
-    var d = window.document.getElementById(this.fieldname + '_date');
-	var h = window.document.getElementById(this.fieldname + '_hours');
-	var m = window.document.getElementById(this.fieldname + '_minutes');
-	var mer = document.getElementById(this.fieldname + "_meridiem");
-	
-	if(d.value == "") { // if date is not set wipe time settings
+    var d = YAHOO.util.Selector.query('input#' + this.fieldname + '_date')[0];
+    var h = YAHOO.util.Selector.query('select#' + this.fieldname + '_hours')[0];
+    var m = YAHOO.util.Selector.query('select#' + this.fieldname + '_minutes')[0];
+    var mer = YAHOO.util.Selector.query('select#' + this.fieldname + "_meridiem")[0];
+
+    if(d.value == "") { // if date is not set wipe time settings
 		h.selectedIndex = 0;
 		m.selectedIndex = 0;
 		if(mer) mer.selectedIndex = 0;
@@ -242,14 +242,14 @@ Datetimecombo.prototype.update = function(updateListeners) {
 	var newdate = d.value + ' ' + h.value + this.timeseparator  + m.value;
 
 	if(this.hasMeridiem) {
-	   ampm = document.getElementById(this.fieldname + "_meridiem").value;
-	   newdate += ampm;
+        ampm = YAHOO.util.Selector.query('select#' + this.fieldname + "_meridiem")[0].value;
+        newdate += ampm;
 	}
 	if(trim(newdate) == ""+this.timeseparator+""){
 		newdate = '';
 	}
-	document.getElementById(this.fieldname).value = newdate;
-	//Check for onchange actions and fire them
+    YAHOO.util.Selector.query('input#' + this.fieldname)[0].value = newdate;
+    //Check for onchange actions and fire them
 	if(updateListeners)
 		SUGAR.util.callOnChangeListers(this.fieldname);
 
@@ -258,19 +258,21 @@ Datetimecombo.prototype.update = function(updateListeners) {
          date = this.fieldname + '_date';
          hours = this.fieldname + '_hours';
          mins = this.fieldname + '_minutes';
-         
-		 if(document.getElementById(flag).checked) {
-			document.getElementById(flag).value=1;
-			document.getElementById(this.fieldname).value = '';
-			document.getElementById(date).disabled=true;
-			document.getElementById(hours).disabled=true;
-			document.getElementById(mins).disabled=true;
-		 } else {
-			document.getElementById(flag).value=0;
-			document.getElementById(date).disabled=false;
-			document.getElementById(hours).disabled=false;
-			document.getElementById(mins).disabled=false;		 
-		 } 
-	}
-	  
+
+        if (YAHOO.util.Selector.query('input#' + flag)[0].checked)
+        {
+            YAHOO.util.Selector.query('input#' + flag)[0].value = 1;
+            YAHOO.util.Selector.query('input#' + this.fieldname)[0].value = '';
+            YAHOO.util.Selector.query('input#' + date)[0].disabled = true;
+            YAHOO.util.Selector.query('select#' + hours)[0].disabled = true;
+            YAHOO.util.Selector.query('select#' + mins)[0].disabled = true;
+        }
+        else
+        {
+            YAHOO.util.Selector.query('input#' + flag)[0].value = 0;
+            YAHOO.util.Selector.query('input#' + date)[0].disabled = false;
+            YAHOO.util.Selector.query('select#' + hours)[0].disabled = false;
+            YAHOO.util.Selector.query('select#' + mins)[0].disabled = false;
+        }
+    }
 };
diff --git a/jssource/src_files/include/javascript/ajaxUI.js b/jssource/src_files/include/javascript/ajaxUI.js
index 7aba713a..f1531eca 100644
--- a/jssource/src_files/include/javascript/ajaxUI.js
+++ b/jssource/src_files/include/javascript/ajaxUI.js
@@ -258,6 +258,13 @@ SUGAR.ajaxUI = {
             }
             return true;
         } else {
+
+            if( typeof(YAHOO.util.Selector.query("input[type=submit]", form)[0]) != "undefined"
+                    && YAHOO.util.Selector.query("input[type=submit]", form)[0].value == "Save")
+            {
+                ajaxStatus.showStatus(SUGAR.language.get('app_strings', 'LBL_SAVING'));
+            }
+
             form.submit();
             return false;
         }
diff --git a/jssource/src_files/include/javascript/jsclass_async.js b/jssource/src_files/include/javascript/jsclass_async.js
index 962f98cf..8ddcb162 100644
--- a/jssource/src_files/include/javascript/jsclass_async.js
+++ b/jssource/src_files/include/javascript/jsclass_async.js
@@ -82,8 +82,14 @@ SugarVCalClient.prototype.init = function() {}
 SugarVCalClient.prototype.load = function(user_id, request_id) {
     this.user_id = user_id;
 
+    var vcal_server = './vcal_server.php?type=vfb&source=outlook&user_id=' + user_id;
+    if (typeof(window.combo_date_start) != 'undefined') {
+        var date_start = window.combo_date_start.datetime;
+        vcal_server += '&datestart='+date_start;
+    }
+
     // Bug 44239: Removed reliance on jsolait
-    YAHOO.util.Connect.asyncRequest('GET', './vcal_server.php?type=vfb&source=outlook&user_id=' + user_id, {
+    YAHOO.util.Connect.asyncRequest('GET', vcal_server, {
         success: function (result) {
             if (typeof GLOBAL_REGISTRY.freebusy == 'undefined') {
                 GLOBAL_REGISTRY.freebusy = new Object();
diff --git a/jssource/src_files/include/javascript/quickCompose.js b/jssource/src_files/include/javascript/quickCompose.js
index 426a42f4..f0e50127 100644
--- a/jssource/src_files/include/javascript/quickCompose.js
+++ b/jssource/src_files/include/javascript/quickCompose.js
@@ -170,6 +170,7 @@ SUGAR.quickCompose = function() {
 				tinyMCE.init({
 			 		 convert_urls : false,
 			         theme_advanced_toolbar_align : tinyConfig.theme_advanced_toolbar_align,
+                     valid_children : tinyConfig.valid_children,
 			         width: tinyConfig.width,
 			         theme: tinyConfig.theme,
 			         theme_advanced_toolbar_location : tinyConfig.theme_advanced_toolbar_location,
diff --git a/jssource/src_files/include/javascript/sugar_3.js b/jssource/src_files/include/javascript/sugar_3.js
index 22b69e2e..5c82c3f4 100644
--- a/jssource/src_files/include/javascript/sugar_3.js
+++ b/jssource/src_files/include/javascript/sugar_3.js
@@ -1197,7 +1197,7 @@ function validate_form(formname, startsWith){
 		for(var wp = 0; wp < inputsWithErrors.length; wp++) {
 			var elementCoor = findElementPos(inputsWithErrors[wp]);
 			if(!(elementCoor.x >= nwX && elementCoor.y >= nwY &&
-				elementCoor.x <= seX && elementCoor.y <= seY)) { // if input is not within viewport
+                elementCoor.x <= seX+nwX && elementCoor.y <= seY+nwY)) { // if input is not within viewport, modify for SI bug 52497
 					inView = false;
 					scrollToTop = elementCoor.y - 75;
 					scrollToLeft = elementCoor.x - 75;
@@ -3538,6 +3538,22 @@ SUGAR.searchForm = function() {
 	                    }
 					}
 				}
+
+                //clear thesearch form accesekeys and reset them to the appropriate link
+                adv = document.getElementById('advanced_search_link');
+                bas = document.getElementById('basic_search_link');
+                adv.setAttribute('accesskey','');
+                bas.setAttribute('accesskey','');
+                a_key = SUGAR.language.get("app_strings", "LBL_ADV_SEARCH_LNK_KEY");
+
+                //reset the ccesskey based on theview
+                if(theView === 'advanced_search'){
+
+                    bas.setAttribute('accesskey',a_key);
+                }else{
+                    adv.setAttribute('accesskey',a_key);
+                }
+                
 				// show the good search form.
 				document.getElementById(module + theView + 'SearchForm').style.display = '';
                 //if its not the first tab show there is a previous tab.
@@ -3635,6 +3651,11 @@ SUGAR.searchForm = function() {
                 else if ( elemType == 'select' || elemType == 'select-one' || elemType == 'select-multiple' ) {
                     // We have, what I hope, is a select box, time to unselect all options
                     var optionList = elem.options;
+
+                    if (optionList.length > 0) {
+                    	optionList[0].selected = "selected";
+                    }
+
                     for ( var ii = 0 ; ii < optionList.length ; ii++ ) {
                         optionList[ii].selected = false;
                     }
@@ -4222,16 +4243,16 @@ function open_popup(module_name, width, height, initial_filter, close_popup, hid
 		+ ',height=' + height
 		+ ',resizable=1,scrollbars=1';
 
-	if (popup_mode == '' && popup_mode == 'undefined') {
+	if (popup_mode == '' || popup_mode == undefined) {
 		popup_mode='single';
 	}
 	URL+='&mode='+popup_mode;
-	if (create == '' && create == 'undefined') {
+	if (create == '' || create == undefined) {
 		create = 'false';
 	}
 	URL+='&create='+create;
 
-	if (metadata != '' && metadata != 'undefined') {
+	if (metadata != '' && metadata != undefined) {
 		URL+='&metadata='+metadata;
 	}
 
@@ -4243,7 +4264,8 @@ function open_popup(module_name, width, height, initial_filter, close_popup, hid
 		var request_data = popup_request_data;
 	}
     var field_to_name_array_url = '';
-    if (request_data && request_data.field_to_name_array != 'undefined') {
+
+    if (request_data && request_data.field_to_name_array != undefined) {
         for(var key in request_data.field_to_name_array) {
             if ( key.toLowerCase() != 'id' ) {
                 field_to_name_array_url += '&field_to_name[]='+encodeURIComponent(key.toLowerCase());
diff --git a/jssource/src_files/modules/Calendar/Cal.js b/jssource/src_files/modules/Calendar/Cal.js
index 5ee57017..48cc692f 100644
--- a/jssource/src_files/modules/Calendar/Cal.js
+++ b/jssource/src_files/modules/Calendar/Cal.js
@@ -891,6 +891,7 @@
 			visible : false,
 			modal : true,
 			close : true,
+			y : 1,			
 			zIndex : 10
 		});
 		var listeners = new YAHOO.util.KeyListener(document, { keys : 27 }, {fn: function() { CAL.editDialog.cancel();} } );
@@ -1969,7 +1970,10 @@
 		var cal_width = document.getElementById("cal-width-helper").offsetWidth;
 		
 		if (CAL.print) {
-			cal_width = 800;
+            if (CAL.view == "day")
+			    cal_width = 720;
+            else
+                cal_width = 800;
 		}
 			
 		var left_width = 80;
diff --git a/jssource/src_files/modules/Meetings/duration_dependency.js b/jssource/src_files/modules/Meetings/duration_dependency.js
index e68c289b..7b70b67b 100644
--- a/jssource/src_files/modules/Meetings/duration_dependency.js
+++ b/jssource/src_files/modules/Meetings/duration_dependency.js
@@ -53,45 +53,52 @@ function DurationDependency(start_field,end_field,duration_field,format){
 	this.date_delimiter = /([-.\\/])/.exec(this.date_format)[0];
 	this.time_delimiter = /([.:])/.exec(this.time_format)[0];
 	this.has_meridiem = /p/i.test(this.format);
-	
-	var date_format_cleaned = this.date_format.replace(/%/g,"").replace(new RegExp(this.date_delimiter, 'g'),"");
+
+	var delimiter = (this.date_delimiter=="."?"\\"+this.date_delimiter:this.date_delimiter);
+	var date_format_cleaned = this.date_format.replace(/%/g,"").replace(new RegExp(delimiter, 'g'),"");
 	this.month_pos = date_format_cleaned.search(/m/);
 	this.day_pos = date_format_cleaned.search(/d/);
-	this.year_pos = date_format_cleaned.search(/Y/);	
-	
-	if(document.getElementById(end_field).value != "")
-		this.calculate_duration();
-	else
-		this.change_duration();	
-	
+	this.year_pos = date_format_cleaned.search(/Y/);
+
+    if (YAHOO.util.Selector.query('input#' + end_field)[0].value != "")
+    {
+        this.calculate_duration();
+    }
+    else
+    {
+        this.change_duration();
+    }
+
 	this.update_duration_fields();
 	this.set_duration_handler();
 	
 	
-	var self = this;		
-	YAHOO.util.Event.addListener(start_field, "change", function(){
-		self.change_start();		
-	});	
-	YAHOO.util.Event.addListener(end_field, "change", function(){
-		if(self.lock_end_listener)
-			return;
-		self.calculate_duration();
-		self.update_duration_fields();
-		self.set_duration_handler();				
-	});
+	var self = this;
+    YAHOO.util.Event.addListener(YAHOO.util.Selector.query('input#' + start_field)[0], "change", function(){
+        self.change_start();
+    });
+    YAHOO.util.Event.addListener(YAHOO.util.Selector.query('input#' + end_field)[0], "change", function(){
+        if (self.lock_end_listener)
+        {
+            return;
+        }
+        self.calculate_duration();
+        self.update_duration_fields();
+        self.set_duration_handler();
+    });
 	if(duration_field != null){
-		YAHOO.util.Event.addListener(duration_field, "change", function(){
-			self.change_duration();
-			self.update_duration_fields();	
-			SugarWidgetScheduler.update_time();	
-		});
+        YAHOO.util.Event.addListener(YAHOO.util.Selector.query('select#' + duration_field)[0], "change", function(){
+            self.change_duration();
+            self.update_duration_fields();
+            SugarWidgetScheduler.update_time();
+        });
 	}
 }
 
 DurationDependency.prototype.calculate_duration = function(){
 	try{
-		var start = this.parse_date(document.getElementById(this.start_field).value);
-		var end = this.parse_date(document.getElementById(this.end_field).value);	
+        var start = this.parse_date(YAHOO.util.Selector.query('input#' + this.start_field)[0].value);
+        var end = this.parse_date(YAHOO.util.Selector.query('input#' + this.end_field)[0].value);
 		this.duration = (end.getTime() - start.getTime()) / 1000;
 	}catch (e){
 		this.duration = 0;
@@ -101,7 +108,7 @@ DurationDependency.prototype.calculate_duration = function(){
 DurationDependency.prototype.change_start = function(){
 	this.lock_end_listener = true;
 				
-	var start = this.parse_date(document.getElementById(this.start_field).value);	
+    var start = this.parse_date(YAHOO.util.Selector.query('input#' + this.start_field)[0].value);
 	var end = new Date(start.getTime() + this.duration * 1000);	
 	this.set_date(end,this.end_field);
 			
@@ -112,11 +119,11 @@ DurationDependency.prototype.change_start = function(){
 }
 
 DurationDependency.prototype.change_duration = function(){	
-	this.lock_end_listener = true;	
-	
-	this.duration = document.getElementById(this.duration_field).value;	
-	var start = this.parse_date(document.getElementById(this.start_field).value);	
-	var end = new Date(start.getTime() + this.duration * 1000);
+	this.lock_end_listener = true;
+
+    this.duration = YAHOO.util.Selector.query('select#' + this.duration_field)[0].value;
+    var start = this.parse_date(YAHOO.util.Selector.query('input#' + this.start_field)[0].value);
+    var end = new Date(start.getTime() + this.duration * 1000);
 	this.set_date(end,this.end_field);
 		
 	var self = this;
@@ -127,23 +134,23 @@ DurationDependency.prototype.change_duration = function(){
 
 DurationDependency.prototype.update_duration_fields = function(){
 	var minutes = this.duration / 60;
-	
-	var hours_elm = document.getElementById(this.duration_field + "_hours");
-	var minutes_elm = document.getElementById(this.duration_field + "_minutes");
-	if(!hours_elm){
+
+    var hours_elm = YAHOO.util.Selector.query('input#' + this.duration_field + "_hours")[0];
+    var minutes_elm = YAHOO.util.Selector.query('input#' + this.duration_field + "_minutes")[0];
+    if(!hours_elm){
 		hours_elm = document.createElement("input");
 		hours_elm.setAttribute("type","hidden");
 		hours_elm.name = this.duration_field + "_hours";
 		hours_elm.id = hours_elm.name;
-		document.getElementById(this.end_field).parentNode.appendChild(hours_elm);
-	}
+        YAHOO.util.Selector.query('input#' + this.end_field)[0].parentNode.appendChild(hours_elm);
+    }
 	if(!minutes_elm){
 		minutes_elm = document.createElement("input");
 		minutes_elm.setAttribute("type","hidden");
 		minutes_elm.name = this.duration_field + "_minutes";
 		minutes_elm.id = minutes_elm.name;
-		document.getElementById(this.end_field).parentNode.appendChild(minutes_elm);
-	}
+        YAHOO.util.Selector.query('input#' + this.end_field)[0].parentNode.appendChild(minutes_elm);
+    }
 	
 	hours_elm.value = parseInt(minutes / 60);
 	minutes_elm.value = parseInt(minutes % 60);
@@ -176,9 +183,9 @@ DurationDependency.prototype.get_duration_text = function(){
 DurationDependency.prototype.set_duration_handler = function(){
 	if(this.duration_field == null)
 		return;
-	var dur_elm = document.getElementById(this.duration_field);
-	
-	if(dur_elm){	
+    var dur_elm = YAHOO.util.Selector.query('select#' + this.duration_field)[0];
+
+    if(dur_elm){
 		if(this.duration >= 0){
 			this.add_custom_duration(dur_elm);
 		}	
@@ -295,21 +302,21 @@ DurationDependency.prototype.set_date = function(date,field){
 			date += month;
 		if(i == this.day_pos)
 			date += day;
-	}	
+	}
 
-	document.getElementById(field + "_date").value = date;	
-	document.getElementById(field + "_hours").value = hour;
-	document.getElementById(field + "_minutes").value = minute;
-	if(this.has_meridiem){
-		var nodes = document.getElementById(field + "_meridiem").childNodes;
-		for(var i = 0; i < nodes.length; i++){
+    YAHOO.util.Selector.query('input#' + field + "_date")[0].value = date;
+    YAHOO.util.Selector.query('select#' + field + "_hours")[0].value = hour;
+    YAHOO.util.Selector.query('select#' + field + "_minutes")[0].value = minute;
+    if(this.has_meridiem){
+        var nodes = YAHOO.util.Selector.query('select#' + field + "_meridiem")[0].childNodes;
+        for(var i = 0; i < nodes.length; i++){
 			if(nodes[i].value == "AM"){
 				meridiem = meridiem.toUpperCase();
 				break;
 			}
-		}	
-		document.getElementById(field + "_meridiem").value = meridiem;
-	}
+		}
+        YAHOO.util.Selector.query('select#' + field + "_meridiem")[0].value = meridiem;
+    }
 	
 	eval("combo_" + field + ".update()");	
 }
diff --git a/metadata/audit_templateMetaData.php b/metadata/audit_templateMetaData.php
index 3d095ea7..42f26494 100644
--- a/metadata/audit_templateMetaData.php
+++ b/metadata/audit_templateMetaData.php
@@ -54,7 +54,7 @@ $dictionary['audit'] =
 				),
 				'indices' => array (
 				      //name will be re-constructed adding idx_ and table name as the prefix like 'idx_accounts_'
-				      array ('name' => 'primary', 'type' => 'index', 'fields' => array('id')),
+				      array ('name' => 'pk', 'type' => 'primary', 'fields' => array('id')),
 				      array ('name' => 'parent_id', 'type' => 'index', 'fields' => array('parent_id'))
 				)
 		)
diff --git a/modules/ACL/ACLController.php b/modules/ACL/ACLController.php
index b9462f23..5f56b365 100644
--- a/modules/ACL/ACLController.php
+++ b/modules/ACL/ACLController.php
@@ -58,6 +58,7 @@ class ACLController {
 	function requireOwner($category, $value, $type='module'){
 			global $current_user;
 			if(is_admin($current_user))return false;
+			if($current_user->isAdminForModule($category))return false;
 			return ACLAction::userNeedsOwnership($current_user->id, $category, $value,$type);
 	}
 
@@ -98,8 +99,7 @@ class ACLController {
 			}else{
 				unset($moduleList['Calendar']);
 			}
-			if(isset($compList['Activities']) &&
-				!( ACLController::checkModuleAllowed('Notes', $actions) || ACLController::checkModuleAllowed('Notes', $actions))){
+			if(isset($compList['Activities']) && !ACLController::checkModuleAllowed('Notes', $actions)){
 				if($by_value){
 					unset($moduleList[$compList['Activities']]);
 				}else{
@@ -127,7 +127,7 @@ class ACLController {
 		return false;
 	}
 
-	function disabledModuleList($moduleList, $by_value=true,$view='list'){
+	static function disabledModuleList($moduleList, $by_value=true,$view='list'){
 		global $aclModuleList, $current_user;
 		if(is_admin($GLOBALS['current_user'])) return array();
 		$actions = ACLAction::getUserActions($current_user->id, false);
diff --git a/modules/ACLActions/ACLAction.php b/modules/ACLActions/ACLAction.php
index 7ae1eb11..575522a0 100644
--- a/modules/ACLActions/ACLAction.php
+++ b/modules/ACLActions/ACLAction.php
@@ -53,7 +53,7 @@ class ACLAction  extends SugarBean{
     * @param STRING $category - the category (e.g module name - Accounts, Contacts)
     * @param STRING $type - the type (e.g. 'module', 'field')
     */
-    function addActions($category, $type='module'){
+    static function addActions($category, $type='module'){
         global $ACLActions;
         $db = DBManagerFactory::getInstance();
         if(isset($ACLActions[$type])){
@@ -135,7 +135,7 @@ class ACLAction  extends SugarBean{
     * @param INT $access - the access level you want the color for
     * @return the translated access level name or false if the level does not exist
     */
-    function AccessName($access){
+    static function AccessName($access){
         global $ACLActionAccessLevels;
         if(isset($ACLActionAccessLevels[$access])){
             return translate($ACLActionAccessLevels[$access]['label'], 'ACLActions');
@@ -218,7 +218,7 @@ class ACLAction  extends SugarBean{
     * @return ARRAY of ACLActionsArray
     */
 
-    function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
+    static function getUserActions($user_id,$refresh=false, $category='',$type='', $action=''){
         //check in the session if we already have it loaded
         if(!$refresh && !empty($_SESSION['ACL'][$user_id])){
             if(empty($category) && empty($action)){
@@ -314,9 +314,10 @@ class ACLAction  extends SugarBean{
     * @param int $access
     * @return true or false
     */
-    function hasAccess($is_owner=false, $access = 0){
+    static function hasAccess($is_owner=false, $access = 0){
 
         if($access != 0 && $access == ACL_ALLOW_ALL || ($is_owner && $access == ACL_ALLOW_OWNER))return true;
+       //if this exists, then this function is not static, so check the aclaccess parameter
         if(isset($this) && isset($this->aclaccess)){
             if($this->aclaccess == ACL_ALLOW_ALL || ($is_owner && $this->aclaccess == ACL_ALLOW_OWNER))
             return true;
@@ -374,6 +375,11 @@ class ACLAction  extends SugarBean{
 
         }
         if(!empty($_SESSION['ACL'][$user_id][$category][$type][$action])){
+            if (!empty($_SESSION['ACL'][$user_id][$category][$type]['admin']) && $_SESSION['ACL'][$user_id][$category][$type]['admin']['aclaccess'] >= ACL_ALLOW_ADMIN)
+            {
+                // If you have admin access for a module, all ACL's are allowed
+                return $_SESSION['ACL'][$user_id][$category][$type]['admin']['aclaccess'];
+            }            
             return  $_SESSION['ACL'][$user_id][$category][$type][$action]['aclaccess'];
         }
     }
@@ -500,6 +506,3 @@ class ACLAction  extends SugarBean{
 
 
 }
-
-
-?>
\ No newline at end of file
diff --git a/modules/Accounts/Account.php b/modules/Accounts/Account.php
index 0b4af0a2..5596f1c9 100644
--- a/modules/Accounts/Account.php
+++ b/modules/Accounts/Account.php
@@ -149,12 +149,9 @@ class Account extends Company {
 		}
 
 
-        //Combine the email logic original here with bug #26450.
-		if( (!empty($_REQUEST['parent_id']) && !empty($_REQUEST['parent_type']) && $_REQUEST['parent_type'] == 'Emails'
-        	&& !empty($_REQUEST['return_module']) && $_REQUEST['return_module'] == 'Emails' )
-        	||
-        	(!empty($_REQUEST['parent_type']) && $_REQUEST['parent_type'] != 'Accounts' &&
-        	!empty($_REQUEST['return_module']) && $_REQUEST['return_module'] != 'Accounts') ){
+        //Email logic
+		if (!empty($_REQUEST['parent_id']) && !empty($_REQUEST['parent_type']) && $_REQUEST['parent_type'] == 'Emails'
+        	&& !empty($_REQUEST['return_module']) && $_REQUEST['return_module'] == 'Emails') {
 			$_REQUEST['parent_name'] = '';
 			$_REQUEST['parent_id'] = '';
 		}
@@ -337,4 +334,4 @@ class Account extends Company {
 		return get_unlinked_email_query($type, $this);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/modules/Accounts/metadata/subpaneldefs.php b/modules/Accounts/metadata/subpaneldefs.php
index a3831bab..a9c5856b 100644
--- a/modules/Accounts/metadata/subpaneldefs.php
+++ b/modules/Accounts/metadata/subpaneldefs.php
@@ -119,6 +119,7 @@ $layout_defs['Accounts'] = array(
             		'get_subpanel_data' => 'function:get_emails_by_assign_or_link',
           			'function_parameters' => array('import_function_file' => 'include/utils.php', 'link' => 'contacts'),
                     'generate_select'=>true,
+                    'get_distinct_data'=> true,
 				),
 			)
 		),
diff --git a/modules/Accounts/vardefs.php b/modules/Accounts/vardefs.php
index eab9bbb6..6f874a92 100644
--- a/modules/Accounts/vardefs.php
+++ b/modules/Accounts/vardefs.php
@@ -335,13 +335,6 @@ $dictionary['Account'] = array('table' => 'accounts', 'audited'=>true, 'unified_
     'table' => 'users',
   ),
 
-  'products' => array(
-      'name' => 'products',
-      'type' => 'link',
-      'relationship' => 'products_accounts',
-      'source' => 'non-db',
-      'vname' => 'LBL_PRODUCTS',
-  ),
 
  'campaign_id' =>
   array (
diff --git a/modules/Activities/Popup_picker.php b/modules/Activities/Popup_picker.php
index a43702d2..923f6130 100644
--- a/modules/Activities/Popup_picker.php
+++ b/modules/Activities/Popup_picker.php
@@ -258,6 +258,11 @@ class Popup_Picker
 					$email->contact_name = $email_contacts[0]->name;
 				}
 			}
+			$ts = '';
+			if(!empty($email->fetched_row['date_sent'])) {
+			    //emails can have an empty date sent field
+			    $ts = $timedate->fromDb($email->fetched_row['date_sent'])->ts;
+			}
 			$history_list[] = array('name' => $email->name,
 									 'id' => $email->id,
 									 'type' => "Email",
@@ -272,7 +277,7 @@ class Popup_Picker
 									 'date_modified' => $email->date_start." ".$email->time_start,
 									 'description' => $this->getEmailDetails($email),
 									 'date_type' => $app_strings['DATA_TYPE_SENT'],
-									 'sort_value' => $timedate->fromDb($email->fetched_row['date_sent'])->ts,
+									 'sort_value' => $ts,
 									 );
 		} //end Emails
 
diff --git a/modules/Administration/Diagnostic.php b/modules/Administration/Diagnostic.php
index 1545611f..feb39475 100644
--- a/modules/Administration/Diagnostic.php
+++ b/modules/Administration/Diagnostic.php
@@ -47,6 +47,10 @@ global $theme;
 global $current_user;
 
 if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
+{
+    sugar_die("Unauthorized access to diagnostic tool.");
+}
 
 global $db;
 if(empty($db)) {
diff --git a/modules/Administration/DiagnosticDelete.php b/modules/Administration/DiagnosticDelete.php
index d6bea720..6dff3b05 100644
--- a/modules/Administration/DiagnosticDelete.php
+++ b/modules/Administration/DiagnosticDelete.php
@@ -39,6 +39,10 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 if (!is_admin($GLOBALS['current_user'])) {
     sugar_die("Unauthorized access to administration.");
 }
+if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
+{
+    sugar_die("Unauthorized access to diagnostic tool.");
+}
 
 echo getClassicModuleTitle(
         "Administration",
diff --git a/modules/Administration/DiagnosticDownload.php b/modules/Administration/DiagnosticDownload.php
index 81d1bbd7..aad5d375 100644
--- a/modules/Administration/DiagnosticDownload.php
+++ b/modules/Administration/DiagnosticDownload.php
@@ -40,6 +40,10 @@ global $current_user;
 
 
 if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
+{
+    sugar_die("Unauthorized access to diagnostic tool.");
+}
 
 if(!isset($_REQUEST['guid']) || !isset($_REQUEST['time']))
 {
diff --git a/modules/Administration/DiagnosticRun.php b/modules/Administration/DiagnosticRun.php
index 5ff4ee29..60d0aaf9 100644
--- a/modules/Administration/DiagnosticRun.php
+++ b/modules/Administration/DiagnosticRun.php
@@ -45,6 +45,10 @@ global $current_user;
 
 
 if (!is_admin($current_user)) sugar_die("Unauthorized access to administration.");
+if (isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) && $GLOBALS['sugar_config']['hide_admin_diagnostics'])
+{
+    sugar_die("Unauthorized access to diagnostic tool.");
+}
 
 
 global $skip_md5_diff;
diff --git a/modules/Administration/DisplayWarnings.php b/modules/Administration/DisplayWarnings.php
index 9841298f..efa3f9d2 100644
--- a/modules/Administration/DisplayWarnings.php
+++ b/modules/Administration/DisplayWarnings.php
@@ -43,6 +43,10 @@ function displayAdminError($errorString){
 		echo $output;
 }
 
+if(!empty($_SESSION['display_lotuslive_alert'])){
+    displayAdminError(translate('MSG_RECONNECT_LOTUSLIVE', 'Administration'));
+}
+
 //BEGIN SUGARCRM flav=pro
 if( is_admin($current_user) && file_exists('include/SugarSearchEngine/SugarSearchEngineFactory.php') )
 {
@@ -54,6 +58,13 @@ if( is_admin($current_user) && file_exists('include/SugarSearchEngine/SugarSearc
     }
 
 }
+if (is_admin($current_user))
+{
+    if (!empty($GLOBALS['sugar_config']['fts_disable_notification']))
+    {
+        displayAdminError(translate('LBL_FTS_DISABLED', 'Administration'));
+    }
+}
 //END SUGARCRM flav=pro
 
 
diff --git a/modules/Administration/SugarSpriteBuilder.php b/modules/Administration/SugarSpriteBuilder.php
index da8e23a7..496c1b12 100644
--- a/modules/Administration/SugarSpriteBuilder.php
+++ b/modules/Administration/SugarSpriteBuilder.php
@@ -410,7 +410,9 @@ background-position: -{$offset_x}px -{$offset_y}px;
 				}
 
 				// common css header
-				$head = rtrim($head, "\n,")." {background: url('../../../index.php?entryPoint=getImage&imageName={$spriteFileName}&spriteNamespace={$nameSpace}'); no-repeat;display:inline-block;}\n";
+                require_once('include/utils.php');
+                $bg_path = getVersionedPath('index.php').'&entryPoint=getImage&imageName='.$spriteFileName.'&spriteNamespace='.$nameSpace;
+				$head = rtrim($head, "\n,")." {background: url('../../../{$bg_path}'); no-repeat;display:inline-block;}\n";
 
 				// append mode for repeatable sprites
                 $fileMode = $isRepeat ? 'a' : 'w';
diff --git a/modules/Administration/language/en_us.lang.php b/modules/Administration/language/en_us.lang.php
index 642d8321..8f9c1551 100644
--- a/modules/Administration/language/en_us.lang.php
+++ b/modules/Administration/language/en_us.lang.php
@@ -923,7 +923,7 @@ $mod_strings = array (
  	'WARN_LICENSE_EXPIRED'=> "Notice: Your license expires in ",
     'WARN_LICENSE_EXPIRED2' =>" day(s). Please go to the <a href='index.php?action=LicenseSettings&module=Administration'>'\"License Management\"</a>  in the Admin screen.",
     'WARN_LICENSE_SEATS'=>  "Warning: User licenses exceeded by ",
-    'WARN_LICENSE_SEATS2' => ".  Please contact your sales representative or email <a href='mailto:cagroup@sugarcrm.com'>cagroup@sugarcrm.com</a>.",
+    'WARN_LICENSE_SEATS2' => ".  Please contact your sales representative or email <a href='mailto:sales@sugarcrm.com'>sales@sugarcrm.com</a>.",
     'WARN_LICENSE_SEATS_MAXED'=>  "Warning: The number of active users is already the maximum number of licenses allowed: ",
     'WARN_LICENSE_SEATS_EDIT_USER'=>  "Warning: The number of active users is already the maximum number of licenses allowed",
     'WARN_LICENSE_SEATS_USER_CREATE'=>"Warning: The number of active users allowed by your license matches the number of active users in the system. You will not be able to create additional active users.",
@@ -1157,7 +1157,13 @@ $mod_strings = array (
     'LBL_FTS_CONN_SUCCESS' => 'The connection was successfully made. You will need to perform a system index for full-text searching to work for the enabled modules and module fields.',
 	'LBL_FTS_CONN_SUCCESS_SHORT' => 'A system index operation has been scheduled to run within the next several minutes.',
     'LBL_FTS_CONN_FAILURE_SHORT' => 'Unable to schedule an index operation.',
-    'LBL_FTS_PAGE_DESC' => 'To enable full text searching, select the search engine that will be used and enter the host and port of the search engine. To complete the setup, connect to the engine and perform a full system index.',
-    'LBL_FTS_CONNECTION_INVALID' => 'The Full Text Search Settings you have entered are invalid and may slow down system performance.  Please change or clear your settings.'
+    'LBL_FTS_PAGE_DESC' => 'To enable full text searching:<br>
+1) Select the search engine that will be used<br>
+2) Enter the host and port of the search engine<br>
+3) Click Test to make sure Sugar can connect to the search engine<br>
+4) Click Schedule System Index. Make sure that crontab is set up to run cron.php. This will handle indexing as well as the fallback mechanism when the connection to the search engine is interrupted.',
+    'LBL_FTS_DISABLED' => 'Full Text Search has been disabled because the system is not able to connect to the search engine.',
+    'LBL_FTS_CONNECTION_INVALID' => 'The Full Text Search Settings you have entered are invalid and may slow down system performance.  Please change or clear your settings.',
+    'MSG_RECONNECT_LOTUSLIVE' => 'You are currently not connected to IBM SmartCloud. Connect to IBM SmartCloud within your Profile to be able to access IBM SmartCloud meetings and files.'    
 );
 
diff --git a/modules/Administration/metadata/adminpaneldefs.php b/modules/Administration/metadata/adminpaneldefs.php
index 95b68e98..1f39344b 100644
--- a/modules/Administration/metadata/adminpaneldefs.php
+++ b/modules/Administration/metadata/adminpaneldefs.php
@@ -88,7 +88,10 @@ if(!defined('TEMPLATE_URL')){
 
 $admin_option_defs['Administration']['currencies_management']= array('Currencies','LBL_MANAGE_CURRENCIES','LBL_CURRENCY','./index.php?module=Currencies&action=index');
 
-$admin_option_defs['Administration']['backup_management']= array('Backups','LBL_BACKUPS_TITLE','LBL_BACKUPS','./index.php?module=Administration&action=Backups');
+if (!isset($GLOBALS['sugar_config']['hide_admin_backup']) || !$GLOBALS['sugar_config']['hide_admin_backup'])
+{
+    $admin_option_defs['Administration']['backup_management']= array('Backups','LBL_BACKUPS_TITLE','LBL_BACKUPS','./index.php?module=Administration&action=Backups');
+}
 
 $admin_option_defs['Administration']['languages']= array('Currencies','LBL_MANAGE_LANGUAGES','LBL_LANGUAGES','./index.php?module=Administration&action=Languages&view=default');
 
@@ -96,7 +99,10 @@ $admin_option_defs['Administration']['repair']= array('Repair','LBL_UPGRADE_TITL
 
 $admin_option_defs['Administration']['global_search']=array('icon_SearchForm','LBL_GLOBAL_SEARCH_SETTINGS','LBL_GLOBAL_SEARCH_SETTINGS_DESC','./index.php?module=Administration&action=GlobalSearchSettings');
 
-$admin_option_defs['Administration']['diagnostic']= array('Diagnostic','LBL_DIAGNOSTIC_TITLE','LBL_DIAGNOSTIC_DESC','./index.php?module=Administration&action=Diagnostic');
+if (!isset($GLOBALS['sugar_config']['hide_admin_diagnostics']) || !$GLOBALS['sugar_config']['hide_admin_diagnostics'])
+{
+    $admin_option_defs['Administration']['diagnostic']= array('Diagnostic','LBL_DIAGNOSTIC_TITLE','LBL_DIAGNOSTIC_DESC','./index.php?module=Administration&action=Diagnostic');
+}
 
 // Connector Integration
 $admin_option_defs['Administration']['connector_settings']=array('icon_Connectors','LBL_CONNECTOR_SETTINGS','LBL_CONNECTOR_SETTINGS_DESC','./index.php?module=Connectors&action=ConnectorSettings');
diff --git a/modules/Administration/views/view.backups.php b/modules/Administration/views/view.backups.php
index 647c005b..55a5b50a 100644
--- a/modules/Administration/views/view.backups.php
+++ b/modules/Administration/views/view.backups.php
@@ -61,6 +61,10 @@ class ViewBackups extends SugarView
 	    if (!is_admin($current_user)) {
 	        sugar_die("Unauthorized access to administration.");
         }
+        if (isset($GLOBALS['sugar_config']['hide_admin_backup']) && $GLOBALS['sugar_config']['hide_admin_backup'])
+        {
+            sugar_die("Unauthorized access to backups.");
+        }
 	}
     
     /**
diff --git a/modules/Calendar/Cal.js b/modules/Calendar/Cal.js
index d202da1f..00edbe52 100644
--- a/modules/Calendar/Cal.js
+++ b/modules/Calendar/Cal.js
@@ -135,7 +135,7 @@ return;var duration_coef=el.getAttribute("duration_coef");real_celcount=CAL.cell
 celpos=celpos+1;if(real_celcount-celpos-duration_coef<0)
 duration_coef=real_celcount-celpos+1;el.style.height=parseInt((CAL.slot_height+1)*duration_coef-1)+"px";}
 CAL.init_edit_dialog=function(params){CAL.editDialog=false;var rd=CAL.get("cal-edit");var content=CAL.get("edit-dialog-content");if(CAL.dashlet&&rd){document.getElementById("content").appendChild(rd);}
-rd.style.width=params.width+"px";content.style.height=params.height+"px";content.style.overflow="auto";content.style.padding="0";CAL.editDialog=new YAHOO.widget.Dialog("cal-edit",{draggable:true,visible:false,modal:true,close:true,zIndex:10});var listeners=new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){CAL.editDialog.cancel();}});CAL.editDialog.cfg.queueProperty("keylisteners",listeners);CAL.editDialog.cancelEvent.subscribe(function(e,a,o){CAL.close_edit_dialog();});rd.style.display="block";CAL.editDialog.render();rd.style.overflow="auto";rd.style.overflowX="hidden";rd.style.outline="0 none";rd.style.height="auto";}
+rd.style.width=params.width+"px";content.style.height=params.height+"px";content.style.overflow="auto";content.style.padding="0";CAL.editDialog=new YAHOO.widget.Dialog("cal-edit",{draggable:true,visible:false,modal:true,close:true,y:1,zIndex:10});var listeners=new YAHOO.util.KeyListener(document,{keys:27},{fn:function(){CAL.editDialog.cancel();}});CAL.editDialog.cfg.queueProperty("keylisteners",listeners);CAL.editDialog.cancelEvent.subscribe(function(e,a,o){CAL.close_edit_dialog();});rd.style.display="block";CAL.editDialog.render();rd.style.overflow="auto";rd.style.overflowX="hidden";rd.style.outline="0 none";rd.style.height="auto";}
 CAL.open_edit_dialog=function(params){document.getElementById("form_content").innerHTML="";CAL.editDialog.center();CAL.editDialog.show();var nodes=CAL.query("#cal-tabs li a");CAL.each(nodes,function(i,v){YAHOO.util.Event.on(nodes[i],'click',function(){CAL.select_tab(this.getAttribute("tabname"));});});stay_on_tab=false
 if(typeof params!="undefined"&&typeof params.stay_on_tab!="undefined"&&params.stay_on_tab)
 stay_on_tab=true;if(!stay_on_tab){var nodes_li=CAL.query("#cal-tabs li");CAL.each(nodes_li,function(j,v){CAL.dom.removeClass(nodes_li[j],"selected");if(j==0)
@@ -257,7 +257,9 @@ CAL.update_vcal=function(){var v=CAL.current_user_id;var callback={success:funct
 if(typeof GLOBAL_REGISTRY.freebusy_adjusted=='undefined'){GLOBAL_REGISTRY.freebusy_adjusted=new Object();}
 GLOBAL_REGISTRY.freebusy[v]=SugarVCalClient.parseResults(result.responseText,false);GLOBAL_REGISTRY.freebusy_adjusted[v]=SugarVCalClient.parseResults(result.responseText,true);SugarWidgetScheduler.update_time();}};var url="vcal_server.php?type=vfb&source=outlook&user_id="+v;YAHOO.util.Connect.asyncRequest('GET',url,callback,false);}
 CAL.fit_grid=function(control_call){if(CAL.view=='year'){return;}
-var day_width;var cal_width=document.getElementById("cal-width-helper").offsetWidth;if(CAL.print){cal_width=800;}
+var day_width;var cal_width=document.getElementById("cal-width-helper").offsetWidth;if(CAL.print){if(CAL.view=="day")
+cal_width=720;else
+cal_width=800;}
 var left_width=80;if(CAL.style=="basic"){if(CAL.view!="month"){left_width=20;}else
 left_width=60;}
 if(CAL.view=="day"){day_width=parseInt((cal_width-left_width-10));if(typeof control_call=="undefined"||!control_call){setTimeout(function(){CAL.fit_grid(true);setTimeout(function(){CAL.fit_grid(true);},100);},100);}}else{day_width=parseInt((cal_width-left_width)/ 7);}
diff --git a/modules/Calendar/CalendarGrid.php b/modules/Calendar/CalendarGrid.php
index 121b4e3f..da78d8ba 100644
--- a/modules/Calendar/CalendarGrid.php
+++ b/modules/Calendar/CalendarGrid.php
@@ -74,13 +74,15 @@ class CalendarGrid {
 		$this->weekdays = $weekdays;
 
 		$this->scrollable = false;
-		if(in_array($this->cal->view,array('day','week'))){
-			$this->scrollable = true;
-			if($this->cal->time_step < 30)
-				$this->scroll_height = 480;
-			else
-				$this->scroll_height = $this->cal->celcount * 15 + 1;
-		}
+        if (!($this->cal->isPrint() && $this->cal->view == 'day')) {
+            if(in_array($this->cal->view,array('day','week'))){
+               $this->scrollable = true;
+               if($this->cal->time_step < 30)
+                    $this->scroll_height = 480;
+               else
+                    $this->scroll_height = $this->cal->celcount * 15 + 1;
+           }
+        }
 
 		$this->time_step = $this->cal->time_step;
 		$this->time_format = $GLOBALS['timedate']->get_time_format();
diff --git a/modules/Calls/Call.php b/modules/Calls/Call.php
index 39fd767e..92802283 100644
--- a/modules/Calls/Call.php
+++ b/modules/Calls/Call.php
@@ -134,7 +134,7 @@ class Call extends SugarBean {
          if(!empty($GLOBALS['app_list_strings']['duration_intervals']))
         	$this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
 	}
-	
+
 	/**
 	 * Disable edit if call is recurring and source is not Sugar. It should be edited only from Outlook.
 	 * @param $view string
@@ -194,11 +194,11 @@ class Call extends SugarBean {
         if (empty($this->status) ) {
             $this->status = $this->getDefaultStatus();
         }
-        
+
 		// prevent a mass mailing for recurring meetings created in Calendar module
 		if (empty($this->id) && !empty($_REQUEST['module']) && $_REQUEST['module'] == "Calendar" && !empty($_REQUEST['repeat_type']) && !empty($this->repeat_parent_id)) {
 			$check_notify = false;
-		}       
+		}
 		/*nsingh 7/3/08  commenting out as bug #20814 is invalid
 		if($current_user->getPreference('reminder_time')!= -1 &&  isset($_POST['reminder_checked']) && isset($_POST['reminder_time']) && $_POST['reminder_checked']==0  && $_POST['reminder_time']==-1){
 			$this->reminder_checked = '1';
@@ -409,14 +409,14 @@ class Call extends SugarBean {
 		if (empty($this->email_reminder_time)) {
 			$this->email_reminder_time = -1;
 		}
-		if(empty($this->id)){ 
+		if(empty($this->id)){
 			$reminder_t = $GLOBALS['current_user']->getPreference('email_reminder_time');
 			if(isset($reminder_t))
 		    		$this->email_reminder_time = $reminder_t;
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
-		if (isset ($_REQUEST['parent_type'])) {
+		if (isset ($_REQUEST['parent_type']) && (!isset($_REQUEST['action']) || $_REQUEST['action'] != 'SubpanelEdits')) {
 			$this->parent_type = $_REQUEST['parent_type'];
 		} elseif (is_null($this->parent_type)) {
 			$this->parent_type = $app_list_strings['record_type_default_key'];
@@ -461,10 +461,8 @@ class Call extends SugarBean {
 
 		//make sure we grab the localized version of the contact name, if a contact is provided
 		if (!empty($this->contact_id)) {
-		    global $locale;
            // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
-            $contact_temp = new Contact();
-            $contact_temp->retrieve($this->contact_id);
+            $contact_temp = BeanFactory::getBean("Contacts", $this->contact_id);
             $contact_temp->_create_proper_name_field();
             $this->contact_name = $contact_temp->full_name;
 		}
@@ -473,7 +471,7 @@ class Call extends SugarBean {
         $call_fields['CONTACT_NAME'] = $this->contact_name;
 		$call_fields['PARENT_NAME'] = $this->parent_name;
         $call_fields['REMINDER_CHECKED'] = $this->reminder_time==-1 ? false : true;
-	$call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
+	    $call_fields['EMAIL_REMINDER_CHECKED'] = $this->email_reminder_time==-1 ? false : true;
 
 		return $call_fields;
 	}
@@ -727,12 +725,12 @@ class Call extends SugarBean {
         }
         return '';
     }
-    
+
     public function mark_deleted($id)
     {
         require_once("modules/Calendar/CalendarUtils.php");
         CalendarUtils::correctRecurrences($this, $id);
-                
+
         parent::mark_deleted($id);
     }
 }
diff --git a/modules/Calls/CallFormBase.php b/modules/Calls/CallFormBase.php
index 5bb0c04e..736e405e 100644
--- a/modules/Calls/CallFormBase.php
+++ b/modules/Calls/CallFormBase.php
@@ -265,7 +265,7 @@ function handleSave($prefix,$redirect=true,$useRequired=false) {
   			$_POST['user_invitees'] .= ','.$_POST['assigned_user_id'].', ';
   			$_POST['user_invitees'] = str_replace(',,', ',', $_POST['user_invitees']);
   		}
-  	}elseif (empty($focus->id) ){
+  	}else {
 	  	//this is not from long form so add assigned and current user automatically as there is no invitee list UI.
 	  	//This call could be through an ajax call from subpanels or shortcut bar
 	  	$_POST['user_invitees'] .= ','.$_POST['assigned_user_id'].', ';
@@ -280,7 +280,8 @@ function handleSave($prefix,$redirect=true,$useRequired=false) {
   	}
 
     if( (isset($_POST['isSaveFromDetailView']) && $_POST['isSaveFromDetailView'] == 'true') ||
-        (isset($_POST['is_ajax_call']) && !empty($_POST['is_ajax_call']) && !empty($focus->id))
+        (isset($_POST['is_ajax_call']) && !empty($_POST['is_ajax_call']) && !empty($focus->id) ||
+        (isset($_POST['return_action']) && $_POST['return_action'] == 'SubPanelViewer') && !empty($focus->id))
     ){
         $focus->save(true);
         $return_id = $focus->id;
diff --git a/modules/CampaignLog/language/en_us.lang.php b/modules/CampaignLog/language/en_us.lang.php
index 05a17fb2..09eaf175 100644
--- a/modules/CampaignLog/language/en_us.lang.php
+++ b/modules/CampaignLog/language/en_us.lang.php
@@ -86,6 +86,9 @@ $mod_strings = array (
   	'LBL_CAMPAIGN_CONTENT' => 'Description: ',
     'LBL_CREATED_LEAD' => 'Created Lead',
     'LBL_CREATED_CONTACT' => 'Created Contact',
+    'LBL_CREATED_OPPORTUNITY' => 'Created Opportunity',
+    'LBL_TARGETED_USER' => 'Targeted User',
+    'LBL_SENT_EMAIL' => 'Sent Email',
   	'LBL_LIST_FORM_TITLE'=> 'Targeted Campaigns',	
   	'LBL_LIST_ACTIVITY_DATE'=>'Activity Date',
   	'LBL_LIST_CAMPAIGN_OBJECTIVE'=>'Campaign Objective',
diff --git a/modules/CampaignLog/vardefs.php b/modules/CampaignLog/vardefs.php
index 4653240e..5702c80d 100644
--- a/modules/CampaignLog/vardefs.php
+++ b/modules/CampaignLog/vardefs.php
@@ -52,21 +52,24 @@ $dictionary['CampaignLog'] = array ('audited'=>false,
 			'name' => 'campaign_id',
 			'vname' => 'LBL_CAMPAIGN_ID',
 			'type' => 'id',
-			'comment' => 'Campaign identifier'
+			'comment' => 'Campaign identifier',
+            'reportable' => false,
 			),
 		'target_tracker_key' => array (
 			'name' => 'target_tracker_key',
 			'vname' => 'LBL_TARGET_TRACKER_KEY',
 			'type' => 'varchar',
 			'len' => '36',
-			'comment' => 'Identifier of Tracker URL'
+			'comment' => 'Identifier of Tracker URL',
+            'reportable' => false,
 			),
 		'target_id' => array (
 			'name' => 'target_id',
 			'vname' => 'LBL_TARGET_ID',
 			'type' => 'varchar',
 			'len' => '36',
-			'comment' => 'Identifier of target record'
+			'comment' => 'Identifier of target record',
+            'reportable' => false,
 			),
 		'target_type' => array (
 			'name' => 'target_type',
@@ -94,6 +97,7 @@ $dictionary['CampaignLog'] = array ('audited'=>false,
 			'vname' => 'LBL_RELATED_ID',
 			'type' => 'varchar',
 			'len' => '36',
+            'reportable' => false,
 			),
 		'related_type' => array (
 			'name' => 'related_type',
@@ -231,6 +235,27 @@ $dictionary['CampaignLog'] = array ('audited'=>false,
             'relationship' => 'campaignlog_lead',
             'source'=>'non-db',
         ),
+        'created_opportunities'=> array (
+            'name'         => 'created_opportunities',
+            'vname'        => 'LBL_CREATED_OPPORTUNITY',
+            'type'         => 'link',
+            'relationship' => 'campaignlog_created_opportunities',
+            'source'       => 'non-db',
+        ),
+        'targeted_user' => array(
+            'name'         => 'targeted_user',
+            'vname'        => 'LBL_TARGETED_USER',
+            'type'         => 'link',
+            'relationship' => 'campaignlog_targeted_users',
+            'source'       => 'non-db',
+        ),
+        'sent_email'    => array(
+            'name'         => 'sent_email',
+            'vname'        => 'LBL_SENT_EMAIL',
+            'type'         => 'link',
+            'relationship' => 'campaignlog_sent_emails',
+            'source'       => 'non-db',
+        ),
 	),
 	'indices' => array (
 		array (
@@ -289,9 +314,33 @@ $dictionary['CampaignLog'] = array ('audited'=>false,
 							        'rhs_table'=> 'leads',
 							        'rhs_key' => 'id',
 							        'relationship_type'=>'one-to-many'),
-
-        )
-
-
+        'campaignlog_created_opportunities' => array(
+            'lhs_module'=> 'CampaignLog',
+            'lhs_table'=> 'campaign_log',
+            'lhs_key' => 'related_id',
+            'rhs_module'=> 'Opportunities',
+            'rhs_table'=> 'opportunities',
+            'rhs_key' => 'id',
+            'relationship_type'=>'one-to-many'
+        ),
+        'campaignlog_targeted_users' => array(
+            'lhs_module'=> 'CampaignLog',
+            'lhs_table'=> 'campaign_log',
+            'lhs_key' => 'target_id',
+            'rhs_module'=> 'Users',
+            'rhs_table'=> 'users',
+            'rhs_key' => 'id',
+            'relationship_type'=>'one-to-many'
+        ),
+        'campaignlog_sent_emails' => array(
+            'lhs_module'=> 'CampaignLog',
+            'lhs_table'=> 'campaign_log',
+            'lhs_key' => 'related_id',
+            'rhs_module'=> 'Emails',
+            'rhs_table'=> 'emails',
+            'rhs_key' => 'id',
+            'relationship_type'=>'one-to-many'
+        ),
+    )
 );
 ?>
\ No newline at end of file
diff --git a/modules/Campaigns/Campaign.php b/modules/Campaigns/Campaign.php
index 76b6e377..6c078350 100644
--- a/modules/Campaigns/Campaign.php
+++ b/modules/Campaigns/Campaign.php
@@ -235,6 +235,11 @@ class Campaign extends SugarBean {
 
 		$this->unformat_all_fields();
 
+		// Bug53301
+		if($this->campaign_type != 'NewsLetter') {
+		    $this->frequency = '';
+		}
+		
 		return parent::save($check_notify);
 
 	}
diff --git a/modules/Campaigns/WebToLeadCapture.php b/modules/Campaigns/WebToLeadCapture.php
index ef4488a3..7591cfe3 100644
--- a/modules/Campaigns/WebToLeadCapture.php
+++ b/modules/Campaigns/WebToLeadCapture.php
@@ -103,6 +103,11 @@ if (isset($_POST['campaign_id']) && !empty($_POST['campaign_id'])) {
             unset($lead->required_fields['id']);
             unset($lead->required_fields['team_name']);
             unset($lead->required_fields['team_count']);
+
+            // Bug #52563 : Web to Lead form redirects to Sugar when duplicate detected
+            // prevent duplicates check
+            $_POST['dup_checked'] = true;
+
             // checkRequired needs a major overhaul before it works for web to lead forms.
             $lead = $leadForm->handleSave($prefix, false, false, false, $lead);
             
diff --git a/modules/Campaigns/WebToLeadDownloadForm.html b/modules/Campaigns/WebToLeadDownloadForm.html
index b1a7035c..9acc5d81 100644
--- a/modules/Campaigns/WebToLeadDownloadForm.html
+++ b/modules/Campaigns/WebToLeadDownloadForm.html
@@ -42,6 +42,10 @@
 <!-- BEGIN: main -->
 <style>
 	#subjectfield { height: 1.6em; }
+
+    .charset_notice  { color:red; }
+    .charset_headtag { color:#880000; }
+    .charset_metatag { color:blue; }
 </style>
 
 {JAVASCRIPT}
@@ -79,7 +83,22 @@
 	<!-- BEGIN: copy_source -->
 	<tr>
 		<td>
-			<b>{MOD.LBL_COPY_AND_PASTE_CODE}</b><br/>
+			<b>{MOD.LBL_COPY_AND_PASTE_CODE}</b>
+            <p>
+                <b><span class='charset_notice'>{MOD.LBL_CHARSET_NOTICE}</span></b><br/>
+                <span class='charset_headtag'>
+                    &lt;head&gt;<br />
+                    ...<br />
+                </span>
+                <span class='charset_metatag'>
+                    &lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot;&gt;<br />
+                </span>
+                <span class='charset_headtag'>
+                    ...<br />
+                    &lt;/head&gt;<br />
+                </span>
+                <br />
+            </p>
 			<textarea rows="6" cols="80">{RAW_SOURCE}</textarea>
 		</td>
 	</tr>
diff --git a/modules/Campaigns/WebToLeadFormSave.php b/modules/Campaigns/WebToLeadFormSave.php
index b8b36f12..6e595de4 100644
--- a/modules/Campaigns/WebToLeadFormSave.php
+++ b/modules/Campaigns/WebToLeadFormSave.php
@@ -51,10 +51,11 @@ global $mod_strings;
 global $app_strings;
 
 
-$rawsource = false;
 //-----------begin replacing text input tags that have been marked with text area tags
 //get array of text areas strings to process
 $bodyHTML = html_entity_decode($_REQUEST['body_html'],ENT_QUOTES);
+//Bug53791
+$bodyHTML = str_replace(chr(160), " ", $bodyHTML);
 
 while (strpos($bodyHTML, "ta_replace") !== false){
 
@@ -77,47 +78,29 @@ while (strpos($bodyHTML, "ta_replace") !== false){
 	//merge the processed string back into bodyhtml string
 	$bodyHTML = str_replace($working_str , $new_str, $bodyHTML);
 }
-
-//replace the request html value with the processed bodyHTML
-$bodyHTML = htmlentities($bodyHTML,ENT_QUOTES);
-$_REQUEST['body_html'] = $bodyHTML;
 //<<<----------end replacing marked text inputs with text area tags
-$form_name = 'WebToLeadForm_'.time().'.html';
-if(!empty($_REQUEST['body_html'])){
-  $dir_path = sugar_cached("generated_forms/");
-  if(!file_exists($dir_path)){
-  	sugar_mkdir($dir_path,0777);
-  }
-  //Check to ensure we have <html> tags in the form. Without them, IE8 will attempt to display the page as XML.
-  $rawsource = $_REQUEST['body_html'];
-
-  $SugarTiny =  new SugarTinyMCE();
-  $rawsource = $SugarTiny->cleanEncodedMCEHtml($rawsource);
-  $html = from_html($rawsource);
-
-  if (stripos($html, "<html") === false)
-  {
+
+$guid = create_guid();
+$form_file = "upload://$guid";
+
+$SugarTiny =  new SugarTinyMCE();
+$html = $SugarTiny->cleanEncodedMCEHtml($bodyHTML);
+
+//Check to ensure we have <html> tags in the form. Without them, IE8 will attempt to display the page as XML.
+if (stripos($html, "<html") === false) {
     $langHeader = get_language_header();
-  	$html = "<html {$langHeader}><body>" . $html . "</body></html>";
-  }
-  $file = $dir_path.$form_name;
-  $fp = sugar_fopen($file,'wb');
-  fwrite($fp, $html);
-  fclose($fp);
+    $html = "<html {$langHeader}><head><meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\"></head><body>" . $html . "</body></html>";
 }
+file_put_contents($form_file, $html);
+
 $xtpl=new XTemplate ('modules/Campaigns/WebToLeadDownloadForm.html');
 $xtpl->assign("MOD", $mod_strings);
 $xtpl->assign("APP", $app_strings);
 
 $webformlink = "<b>$mod_strings[LBL_DOWNLOAD_TEXT_WEB_TO_LEAD_FORM]</b><br/>";
-$webformlink .= "<a href=\"cache/generated_forms/$form_name\">$mod_strings[LBL_DOWNLOAD_WEB_TO_LEAD_FORM]</a>";
+$webformlink .= "<a href=\"index.php?entryPoint=download&id={$guid}&isTempFile=1&tempName=WebToLeadForm.html&type=temp\">$mod_strings[LBL_DOWNLOAD_WEB_TO_LEAD_FORM]</a>";
 $xtpl->assign("LINK_TO_WEB_FORM",$webformlink);
-if ($rawsource !== false)
-{
-	$xtpl->assign("RAW_SOURCE", $rawsource);
-	$xtpl->parse("main.copy_source");
-}
-	$xtpl->parse("main");
+$xtpl->assign("RAW_SOURCE", htmlentities($html, ENT_QUOTES));
+$xtpl->parse("main.copy_source");
+$xtpl->parse("main");
 $xtpl->out("main");
-
-?>
\ No newline at end of file
diff --git a/modules/Campaigns/WizardHome.php b/modules/Campaigns/WizardHome.php
index 603dfe15..f7e77dd8 100644
--- a/modules/Campaigns/WizardHome.php
+++ b/modules/Campaigns/WizardHome.php
@@ -234,8 +234,8 @@ function create_campaign_summary  ($focus){
     $cmpgn_tbl .= "<td align='right'>$cmp_input</td></tr>";
     $colorclass = '';
     foreach($fields as $key){
-    	        
-                if(!empty($focus->$key)){
+
+                if(!empty($focus->$key) && !empty($mod_strings[$focus->field_name_map[$key]['vname']])){
                     $cmpgn_tbl .= "<tr><td scope='row' width='15%'>".$mod_strings[$focus->field_name_map[$key]['vname']]."</td>\n";
                     if($key == 'team_name') {
 					   require_once('modules/Teams/TeamSetManager.php');
@@ -247,7 +247,6 @@ function create_campaign_summary  ($focus){
     }
     $cmpgn_tbl .= "</table></p>";
     
-    
     return $cmpgn_tbl ;
 }
 
diff --git a/modules/Campaigns/WizardMarketing.html b/modules/Campaigns/WizardMarketing.html
index 66720b51..fb5c2ac0 100644
--- a/modules/Campaigns/WizardMarketing.html
+++ b/modules/Campaigns/WizardMarketing.html
@@ -140,7 +140,7 @@
 		</tr>
 		<tr>
 			<td scope="col" NOWRAP valign="top"><slot>{$MOD.LBL_MESSAGE_FOR} <span class="required">{$APP.LBL_REQUIRED_SYMBOL}</span></slot></td>
-			<td class="datafield"><slot><input type="checkbox"  tabindex='1' onclick="toggle_message_for(this);" id="all_prospect_lists" {$ALL_PROSPECT_LISTS_CHECKED} name='all_prospect_lists' title="{$MOD.LBL_MESSAGE_FOR}'>{$MOD.LBL_ALL_PROSPECT_LISTS}</slot></td>
+			<td class="datafield"><slot><input type="checkbox"  tabindex='1' onclick="toggle_message_for(this);" id="all_prospect_lists" {$ALL_PROSPECT_LISTS_CHECKED} name='all_prospect_lists' title="{$MOD.LBL_MESSAGE_FOR}">{$MOD.LBL_ALL_PROSPECT_LISTS}</slot></td>
 			<td scope="col" NOWRAP valign="top"><slot>{$MOD.LBL_TEMPLATE} <span class="required">{$APP.LBL_REQUIRED_SYMBOL}</span></slot></td>
 			<td class="datafield" nowrap>
 					<select  id="template_id" name='template_id' tabindex='2' onchange="show_edit_template_link(this);" title='{$MOD.LBL_TEMPLATE}'>{$EMAIL_TEMPLATE_OPTIONS}</select>
diff --git a/modules/Campaigns/language/en_us.lang.php b/modules/Campaigns/language/en_us.lang.php
index e6c2b3e9..bebab9c1 100644
--- a/modules/Campaigns/language/en_us.lang.php
+++ b/modules/Campaigns/language/en_us.lang.php
@@ -122,6 +122,7 @@ $mod_strings = array (
   'LBL_TEST_BUTTON_KEY'=>'e',
   'LBL_TEST_BUTTON_LABEL'=>'Send Test',
   'LBL_COPY_AND_PASTE_CODE' => 'Or copy and paste the html below into an existing page',
+  'LBL_CHARSET_NOTICE' => 'NOTE: Please make sure that the page containing the web-to-lead form has the following lines in the &lt;head&gt; section:',
 
   'LBL_TODETAIL_BUTTON_TITLE'=>'View Details',
   'LBL_TODETAIL_BUTTON_KEY'=>'T',
diff --git a/modules/Campaigns/metadata/detailviewdefs.php b/modules/Campaigns/metadata/detailviewdefs.php
index cad73bf9..bddb552c 100644
--- a/modules/Campaigns/metadata/detailviewdefs.php
+++ b/modules/Campaigns/metadata/detailviewdefs.php
@@ -140,7 +140,7 @@ $viewdefs['Campaigns']['DetailView'] = array(
 	    ),
 	    array(
           	'name' => 'frequency',
-          	'customCode' => '{if $fields.campaign_type.value == "NewsLetter"}<div style=\'none\' id=\'freq_field\'>{$fields.frequency.value}</div>{/if}&nbsp;',
+          	'customCode' => '{if $fields.campaign_type.value == "NewsLetter"}<div style=\'none\' id=\'freq_field\'>{$APP_LIST.newsletter_frequency_dom[$fields.frequency.value]}</div>{/if}&nbsp;',
           	'customLabel' => '{if $fields.campaign_type.value == "NewsLetter"}<div style=\'none\' id=\'freq_label\'>{$MOD.LBL_CAMPAIGN_FREQUENCY}</div>{/if}&nbsp;'
           ),
 	  ),
diff --git a/modules/Campaigns/utils.php b/modules/Campaigns/utils.php
index c936062b..72dadcfe 100644
--- a/modules/Campaigns/utils.php
+++ b/modules/Campaigns/utils.php
@@ -175,6 +175,7 @@ function log_campaign_activity($identifier, $activity, $update=true, $clicked_ur
                 $data['activity_type']="'" .  $activity . "'";
                 $data['activity_date']="'" . TimeDate::getInstance()->nowDb() . "'";
                 $data['hits']=1;
+                $data['deleted']=0;
                 if (!empty($clicked_url_key)) {
                     $data['related_id']="'".$clicked_url_key."'";
                     $data['related_type']="'".'CampaignTrackers'."'";
@@ -236,6 +237,7 @@ function log_campaign_activity($identifier, $activity, $update=true, $clicked_ur
                 $data['list_id']="'" .  $row['list_id'] . "'";
                 $data['marketing_id']="'" .  $row['marketing_id'] . "'";
                 $data['hits']=1;
+                $data['deleted']=0;
                 if (!empty($clicked_url_key)) {
                     $data['related_id']="'".$clicked_url_key."'";
                     $data['related_type']="'".'CampaignTrackers'."'";
@@ -858,7 +860,7 @@ function write_mail_merge_log_entry($campaign_id,$pl_row) {
         $data['activity_date']="'" . TimeDate::getInstance()->nowDb() . "'";
         $data['list_id']="'" .  $GLOBALS['db']->quote($pl_row['prospect_list_id']) . "'";
         $data['hits']=1;
-
+        $data['deleted']=0;
         $insert_query="INSERT into campaign_log (" . implode(",",array_keys($data)) . ")";
         $insert_query.=" VALUES  (" . implode(",",array_values($data)) . ")";
         $GLOBALS['db']->query($insert_query);
@@ -873,9 +875,9 @@ function write_mail_merge_log_entry($campaign_id,$pl_row) {
         $current_date = $focus->db->now();
         $guidSQL = $focus->db->getGuidSQL();
 
-        $insert_query= "INSERT INTO campaign_log (id,activity_date, campaign_id, target_tracker_key,list_id, target_id, target_type, activity_type";
+        $insert_query= "INSERT INTO campaign_log (id,activity_date, campaign_id, target_tracker_key,list_id, target_id, target_type, activity_type, deleted";
         $insert_query.=')';
-        $insert_query.="SELECT {$guidSQL}, $current_date, plc.campaign_id,{$guidSQL},plp.prospect_list_id, plp.related_id, plp.related_type,'targeted' ";
+        $insert_query.="SELECT {$guidSQL}, $current_date, plc.campaign_id,{$guidSQL},plp.prospect_list_id, plp.related_id, plp.related_type,'targeted',0 ";
         $insert_query.="FROM prospect_lists INNER JOIN prospect_lists_prospects plp ON plp.prospect_list_id = prospect_lists.id";
         $insert_query.=" INNER JOIN prospect_list_campaigns plc ON plc.prospect_list_id = prospect_lists.id";
         $insert_query.=" WHERE plc.campaign_id='".$GLOBALS['db']->quote($focus->id)."'";
diff --git a/modules/Campaigns/views/view.detail.php b/modules/Campaigns/views/view.detail.php
index 4e59e446..5033ec68 100644
--- a/modules/Campaigns/views/view.detail.php
+++ b/modules/Campaigns/views/view.detail.php
@@ -71,7 +71,9 @@ class CampaignsViewDetail extends ViewDetail {
     }        
 
  	function display() {
-        
+ 	    global $app_list_strings; 
+ 	    $this->ss->assign('APP_LIST', $app_list_strings);
+ 	    
         if (isset($_REQUEST['mode']) && $_REQUEST['mode']=='set_target'){
             require_once('modules/Campaigns/utils.php');
             //call function to create campaign logs
diff --git a/modules/Cases/Case.php b/modules/Cases/Case.php
index d9bbb44c..d41f72f2 100644
--- a/modules/Cases/Case.php
+++ b/modules/Cases/Case.php
@@ -226,7 +226,7 @@ class aCase extends Basic {
 		$temp_array = $this->get_list_view_array();
 		$temp_array['NAME'] = (($this->name == "") ? "<em>blank</em>" : $this->name);
         $temp_array['PRIORITY'] = empty($this->priority)? "" : (!isset($app_list_strings[$this->field_name_map['priority']['options']][$this->priority]) ? $this->priority : $app_list_strings[$this->field_name_map['priority']['options']][$this->priority]);
-        $temp_array['STATUS'] = empty($this->status)? "" : (!isset($app_list_strings[$this->field_name_map['status']['options']][$this->status]) ? $this->status : $app_list_strings[$this->field_name_map['status']['options']][$this->status]);
+        $temp_array['STATUS'] = empty($this->priority)? "" : (!isset($app_list_strings[$this->field_name_map['status']['options']][$this->status]) ? $this->status : $app_list_strings[$this->field_name_map['status']['options']][$this->status]);
 		$temp_array['ENCODED_NAME'] = $this->name;
 		$temp_array['CASE_NUMBER'] = $this->case_number;
 		$temp_array['SET_COMPLETE'] =  "<a href='index.php?return_module=Home&return_action=index&action=EditView&module=Cases&record=$this->id&status=Closed'>".SugarThemeRegistry::current()->getImage("close_inline","title=".translate('LBL_LIST_CLOSE','Cases')." border='0'",null,null,'.gif',translate('LBL_LIST_CLOSE','Cases'))."</a>";
diff --git a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php
index 8c4ebc59..04815a0b 100644
--- a/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php
+++ b/modules/Charts/Dashlets/MyPipelineBySalesStageDashlet/MyPipelineBySalesStageDashlet.php
@@ -94,7 +94,7 @@ class MyPipelineBySalesStageDashlet extends DashletGenericChart
      */
     public function display()
     {
-		global $sugar_config, $current_user;
+        global $sugar_config, $current_user, $timedate;
 
         require_once('include/SugarCharts/SugarChartFactory.php');
 		$sugarChart = SugarChartFactory::getInstance();
@@ -126,6 +126,24 @@ class MyPipelineBySalesStageDashlet extends DashletGenericChart
 			$pipeline_total_string = translate('LBL_TOTAL_PIPELINE', 'Charts') . $sugarChart->currency_symbol . $total . $sugarChart->thousands_symbol;
 			$sugarChart->setProperties($pipeline_total_string, $subtitle, 'horizontal bar chart');
 
+        // Bug #53753 We have to add values for filter based on "Expected Close Date" field
+        if (!empty($this->mypbss_date_start) && !empty($this->mypbss_date_end))
+        {
+            $sugarChart->url_params['date_closed_advanced_range_choice'] = 'between';
+            $sugarChart->url_params['start_range_date_closed_advanced'] = $timedate->to_display_date($this->mypbss_date_start, false);
+            $sugarChart->url_params['end_range_date_closed_advanced'] = $timedate->to_display_date($this->mypbss_date_end, false);
+        }
+        elseif (!empty($this->mypbss_date_start))
+        {
+            $sugarChart->url_params['date_closed_advanced_range_choice'] = 'greater_than';
+            $sugarChart->url_params['range_date_closed_advanced'] = $timedate->to_display_date($this->mypbss_date_start, false);
+        }
+        elseif (!empty($this->mypbss_date_end))
+        {
+            $sugarChart->url_params['date_closed_advanced_range_choice'] = 'less_than';
+            $sugarChart->url_params['range_date_closed_advanced'] = $timedate->to_display_date($this->mypbss_date_end, false);
+        }
+
         $xmlFile = $sugarChart->getXMLFileName($this->id);
         $sugarChart->saveXMLFile($xmlFile, $sugarChart->generateXML());
 
diff --git a/modules/Configurator/Configurator.php b/modules/Configurator/Configurator.php
index af619a61..fa97c13b 100644
--- a/modules/Configurator/Configurator.php
+++ b/modules/Configurator/Configurator.php
@@ -42,7 +42,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 class Configurator {
 	var $config = '';
 	var $override = '';
-	var $allow_undefined = array ('stack_trace_errors', 'export_delimiter', 'use_real_names', 'developerMode', 'default_module_favicon', 'authenticationClass', 'SAML_loginurl', 'SAML_X509Cert', 'dashlet_auto_refresh_min', 'show_download_tab');
+	var $allow_undefined = array ('stack_trace_errors', 'export_delimiter', 'use_real_names', 'developerMode', 'default_module_favicon', 'authenticationClass', 'SAML_loginurl', 'SAML_X509Cert', 'dashlet_auto_refresh_min', 'show_download_tab', 'enable_action_menu');
 	var $errors = array ('main' => '');
 	var $logger = NULL;
 	var $previous_sugar_override_config_array = array();
@@ -101,6 +101,16 @@ class Configurator {
 		$GLOBALS['sugar_config'] = $this->config;
 
 		//print_r($overrideArray);
+        //Bug#53013: Clean the tpl cache if action menu style has been changed.
+        if( isset($overrideArray['enable_action_menu']) &&
+                ( !isset($this->previous_sugar_override_config_array['enable_action_menu']) ||
+                    $overrideArray['enable_action_menu'] != $this->previous_sugar_override_config_array['enable_action_menu'] )
+        ) {
+            require_once('modules/Administration/QuickRepairAndRebuild.php');
+            $repair = new RepairAndClear;
+            $repair->module_list = array();
+            $repair->clearTpls();
+        }
 
 		foreach($overrideArray as $key => $val) {
 			if (in_array($key, $this->allow_undefined) || isset ($sugar_config[$key])) {
diff --git a/modules/Configurator/Forms.php b/modules/Configurator/Forms.php
index 47290309..79ea6303 100644
--- a/modules/Configurator/Forms.php
+++ b/modules/Configurator/Forms.php
@@ -71,6 +71,8 @@ function add_checks(f) {
 	removeFromValidate('ConfigureSettings', 'proxy_username');
 	removeFromValidate('ConfigureSettings', 'proxy_password');
 	
+	removeFromValidate('ConfigureSettings', 'list_max_entries_per_page');
+	removeFromValidate('ConfigureSettings', 'list_max_entries_per_subpanel');	
 	
 	if (typeof f.mail_sendtype != "undefined" && f.mail_sendtype.value == "SMTP") {
 		addToValidate('ConfigureSettings', 'mail_smtpserver', 'varchar', 'true', '{$mod_strings['LBL_MAIL_SMTPSERVER']}');
@@ -89,6 +91,10 @@ function add_checks(f) {
 			addToValidate('ConfigureSettings', 'proxy_password', 'varchar', 'true', '{$mod_strings['LBL_PROXY_PASSWORD']}');
 		}
 	}
+	
+	addToValidateMoreThan('ConfigureSettings', 'list_max_entries_per_page', 'int', true, '', 1);
+	addToValidateMoreThan('ConfigureSettings', 'list_max_entries_per_subpanel', 'int', true, '', 1);
+	
 	return true;
 }
 
diff --git a/modules/Configurator/LogView.php b/modules/Configurator/LogView.php
index 27568ef8..d8e7cd0f 100644
--- a/modules/Configurator/LogView.php
+++ b/modules/Configurator/LogView.php
@@ -74,7 +74,21 @@ define('PROCESS_ID', 1);
 define('LOG_LEVEL', 2);
 define('LOG_NAME', 3);
 define('LOG_DATA', 4);
-$logFile = $sugar_config['log_dir'].'/'.$sugar_config['log_file'];
+
+// bug 53041 - now that we are respecting file name suffixes for log files, we need to get the log file name properly
+$config = SugarConfig::getInstance();
+$ext = $config->get('logger.file.ext');
+$logfile = $config->get('logger.file.name');
+$log_dir = $config->get('log_dir');
+$log_dir = $log_dir . (empty($log_dir)?'':'/');
+$file_suffix = $config->get('logger.file.suffix');
+$date_suffix = "";
+if( !empty($file_suffix) )
+{
+    $date_suffix = "_" . date(str_replace("%", "", $file_suffix));
+}
+
+$logFile = $log_dir . $logfile . $date_suffix . $ext;
 
 if (!file_exists($logFile)) {
 	die('No Log File');
diff --git a/modules/Configurator/language/en_us.lang.php b/modules/Configurator/language/en_us.lang.php
index 184b5a5d..ff2429f9 100644
--- a/modules/Configurator/language/en_us.lang.php
+++ b/modules/Configurator/language/en_us.lang.php
@@ -116,7 +116,9 @@ $mod_strings = array (
 	'LBL_USE_REAL_NAMES_DESC'			=> 'Display users\' full names instead of their User Names in assignment fields.',
     'LBL_DISALBE_CONVERT_LEAD' => 'Disable convert lead action for converted leads',
     'LBL_DISALBE_CONVERT_LEAD_DESC' => 'If a lead has already been converted, enabling this option will remove the convert lead action.',
-	'LIST_ENTRIES_PER_LISTVIEW'=>'Listview items per page',
+    'LBL_ENABLE_ACTION_MENU' => 'Display actions within menus',
+    'LBL_ENABLE_ACTION_MENU_DESC' => 'Select to display DetailView and subpanel actions within a dropdown menu. If un-selected, the actions will display as separate buttons.',
+    'LIST_ENTRIES_PER_LISTVIEW'=>'Listview items per page',
 	'LIST_ENTRIES_PER_SUBPANEL'=>'Subpanel items per page',
 	'LOG_MEMORY_USAGE'=>'Log memory usage',
 	'LOG_SLOW_QUERIES'=>'Log slow queries',
diff --git a/modules/Configurator/tpls/EditView.tpl b/modules/Configurator/tpls/EditView.tpl
index 80cae77d..216217fd 100644
--- a/modules/Configurator/tpls/EditView.tpl
+++ b/modules/Configurator/tpls/EditView.tpl
@@ -173,6 +173,20 @@
         <td colspan="2">&nbsp;</td>
     </tr>
 
+    <tr>
+        <td  scope="row" nowrap>{$MOD.LBL_ENABLE_ACTION_MENU}: &nbsp;{sugar_help text=$MOD.LBL_ENABLE_ACTION_MENU_DESC}</td>
+    {if isset($config.enable_action_menu) && $config.enable_action_menu != "true" }
+        {assign var='enable_action_menu' value=''}
+        {else}
+        {assign var='enable_action_menu' value='CHECKED'}
+    {/if}
+        <td>
+            <input type='hidden' name='enable_action_menu' value='false'>
+            <input name='enable_action_menu'  type="checkbox" value="true" {$enable_action_menu}>
+        </td>
+        <td colspan="2">&nbsp;</td>
+    </tr>
+
 
 
 
@@ -360,12 +374,6 @@
 </div>
 {$JAVASCRIPT}
 
-
-<script>
-addToValidate('ConfigureSettings', 'system_name', 'varchar', true,'System Name' );
-addToValidateMoreThan('ConfigureSettings', 'list_max_entries_per_page', 'int', true, '', 1);
-addToValidateMoreThan('ConfigureSettings', 'list_max_entries_per_subpanel', 'int', true, '', 1);
-</script>
 </form>
 <div id='upload_panel' style="display:none">
     <form id="upload_form" name="upload_form" method="POST" action='index.php' enctype="multipart/form-data">
diff --git a/modules/Configurator/tpls/adminwizard.tpl b/modules/Configurator/tpls/adminwizard.tpl
index ea96530a..765531e9 100644
--- a/modules/Configurator/tpls/adminwizard.tpl
+++ b/modules/Configurator/tpls/adminwizard.tpl
@@ -575,18 +575,20 @@ function changeEmailScreenDisplay(smtptype)
         document.getElementById("mail_smtpuser_label").innerHTML = '{/literal}{$MOD.LBL_YAHOOMAIL_SMTPUSER}{literal}';
         break;
     case "gmail":
-        document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
-        document.getElementById("mail_smtpport").value = '587';
-        document.getElementById("mail_smtpauth_req").checked = true;
-        var ssl = document.getElementById("mail_smtpssl");
-        for(var j=0;j<ssl.options.length;j++) {
-            if(ssl.options[j].text == 'TLS') {
-                ssl.options[j].selected = true;
-                break;
+        if(document.getElementById("mail_smtpserver").value == "" || document.getElementById("mail_smtpserver").value == 'plus.smtp.mail.yahoo.com') {    
+            document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
+            document.getElementById("mail_smtpport").value = '587';
+            document.getElementById("mail_smtpauth_req").checked = true;
+            var ssl = document.getElementById("mail_smtpssl");
+            for(var j=0;j<ssl.options.length;j++) {
+                if(ssl.options[j].text == 'TLS') {
+                    ssl.options[j].selected = true;
+                    break;
+                }
             }
         }
-        document.getElementById("mailsettings1").style.display = 'none';
-        document.getElementById("mailsettings2").style.display = 'none';
+        //document.getElementById("mailsettings1").style.display = 'none';
+        //document.getElementById("mailsettings2").style.display = 'none';
         document.getElementById("mail_smtppass_label").innerHTML = '{/literal}{$MOD.LBL_GMAIL_SMTPPASS}{literal}';
         document.getElementById("mail_smtpuser_label").innerHTML = '{/literal}{$MOD.LBL_GMAIL_SMTPUSER}{literal}';
         break;
diff --git a/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php b/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php
index 06ded03d..9e45141d 100644
--- a/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php
+++ b/modules/Connectors/connectors/sources/ext/rest/linkedin/config.php
@@ -45,8 +45,6 @@ $config = array (
   'properties' => 
   array (
     'company_url'=>'http://www.linkedin.com/companyInsider?script&useBorder=no',
-    'oauth_consumer_key' => '',
-    'oauth_consumer_secret' => '',
   ),
 );
 ?>
diff --git a/modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php b/modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php
index 0a65036e..2fb11062 100644
--- a/modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php
+++ b/modules/Connectors/connectors/sources/ext/rest/linkedin/language/en_us.lang.php
@@ -45,7 +45,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 $connector_strings = array (
     //licensing information shown in config screen
-    'LBL_LICENSING_INFO' => '<table border="0" cellspacing="1"><tr><td valign="top" width="35%" class="dataLabel">Obtain a pair of API and Secret Keys from LinkedIn&#169; by registering your Sugar instance as a new application.<br/><br>Steps to register your instance:<br/><br/><ol><li>Go to the LinkedIn&#169; Developers site: <a href=\'https://www.linkedin.com/secure/developer\' target=\'_blank\'>https://www.linkedin.com/secure/developer</a>.</li><li>Sign In using the LinkedIn&#169; account under which you would like to register the application.</li><li>Click the Add New Application link.</li><li>Complete the Add New Application form.</li><li>Select the Agree checkbox and click Add Application.</li><li>Find the API and Secret Keys for the Linkedin&#169; Connector (Admin – Connector - Linkedin&#169;) in the Application Details page and enter the keys below.</li><li>Click Save.</li></ol></td></tr></table>',
+    'LBL_LICENSING_INFO' => '<table border="0" cellspacing="1"><tr><td valign="top" width="35%" class="dataLabel">This is the URL for the Company Insider plug-in that is used to display LinkedIn&#169; company information. You will not need to change the URL unless LinkedIn&#169; changes the URL for the plug-in.</td></tr></table>',
 
     'LBL_NAME' => 'Company Name',
 
diff --git a/modules/Contacts/AcceptDecline.php b/modules/Contacts/AcceptDecline.php
index 0ae09163..57f9ac44 100644
--- a/modules/Contacts/AcceptDecline.php
+++ b/modules/Contacts/AcceptDecline.php
@@ -36,8 +36,9 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  ********************************************************************************/
 
 
-global $sugar_config, $dbconfig, $beanList, $beanFiles, $app_strings, $app_list_strings,$current_user;
+global $sugar_config, $dbconfig, $beanList, $beanFiles, $app_strings, $app_list_strings, $current_user;
 
+global $currentModule, $focus; 
 
 if ( !empty($_REQUEST['user_id'])) {
     $current_user = new User();
@@ -87,29 +88,8 @@ $focus->set_accept_status($current_entity,$_REQUEST['accept_status']);
 print $app_strings['LBL_STATUS_UPDATED']."<BR><BR>";
 print $app_strings['LBL_STATUS']. " ". $app_list_strings['dom_meeting_accept_status'][$_REQUEST['accept_status']];
 print "<BR><BR>";
-$script = <<<EOQ
-<SCRIPT language="JavaScript">
-<!--
-var browserName=navigator.appName;
-if (browserName=="Netscape") {
-// C.L. fix for Mozilla/Netscape flavors... need a parent window
-function closeme()
-{
-window.open('','_parent','');
-window.close();
-}
-} else {
-function closeme()
-{
-window.close();
-}
-}
-//-->
-</SCRIPT>
-EOQ;
 
-print $script;
-print "<a href='#' onclick='window.closeme(); return false;'>".$app_strings['LBL_CLOSE_WINDOW']."</a><br>";
+print "<a href='?module=$currentModule&action=DetailView&record=$focus->id'>".$app_strings['LBL_MEETING_GO_BACK']."</a><br>";
 sugar_cleanup();
 exit;
 ?>
diff --git a/modules/Contacts/Contact.php b/modules/Contacts/Contact.php
index a90e0eb2..9c918e54 100644
--- a/modules/Contacts/Contact.php
+++ b/modules/Contacts/Contact.php
@@ -146,9 +146,6 @@ class Contact extends Person {
 		parent::Person();
 	}
 
-
-
-
 	function add_list_count_joins(&$query, $where)
 	{
 		// accounts.name
diff --git a/modules/Contacts/ContactFormBase.php b/modules/Contacts/ContactFormBase.php
index 2048e5d0..0e01b2ae 100644
--- a/modules/Contacts/ContactFormBase.php
+++ b/modules/Contacts/ContactFormBase.php
@@ -62,31 +62,31 @@ var $objectName = 'Contact';
  */
 public function getDuplicateQuery($focus, $prefix='')
 {
-	$query = 'SELECT id, first_name, last_name, title FROM contacts ';
-    
+	$query = 'SELECT contacts.id, contacts.first_name, contacts.last_name, contacts.title FROM contacts ';
+
     // Bug #46427 : Records from other Teams shown on Potential Duplicate Contacts screen during Lead Conversion
     // add team security
-    
-    $query .= ' where deleted = 0 AND ';
+
+    $query .= ' where contacts.deleted = 0 AND ';
 	if(isset($_POST[$prefix.'first_name']) && strlen($_POST[$prefix.'first_name']) != 0 && isset($_POST[$prefix.'last_name']) && strlen($_POST[$prefix.'last_name']) != 0){
-		$query .= " first_name LIKE '". $_POST[$prefix.'first_name'] . "%' AND last_name = '". $_POST[$prefix.'last_name'] ."'";
+		$query .= " contacts.first_name LIKE '". $_POST[$prefix.'first_name'] . "%' AND contacts.last_name = '". $_POST[$prefix.'last_name'] ."'";
 	} else {
-		$query .= " last_name = '". $_POST[$prefix.'last_name'] ."'";
+		$query .= " contacts.last_name = '". $_POST[$prefix.'last_name'] ."'";
 	}
 
 	if(!empty($_POST[$prefix.'record'])) {
-		$query .= " AND  id != '". $_POST[$prefix.'record'] ."'";
+		$query .= " AND  contacts.id != '". $_POST[$prefix.'record'] ."'";
 	}
     return $query;
 }
 
 
 function getWideFormBody($prefix, $mod='',$formname='',  $contact = '', $portal = true){
-	
+
 	if(!ACLController::checkAccess('Contacts', 'edit', true)){
 		return '';
 	}
-	
+
 	if(empty($contact)){
 		$contact = new Contact();
 	}
@@ -127,7 +127,7 @@ function getWideFormBody($prefix, $mod='',$formname='',  $contact = '', $portal
     }
 	$lbl_email_address = $mod_strings['LBL_EMAIL_ADDRESS'];
 	$salutation_options=get_select_options_with_id($app_list_strings['salutation_dom'], $contact->salutation);
-	
+
 	if (isset($contact->lead_source)) {
 		$lead_source_options=get_select_options_with_id($app_list_strings['lead_source_dom'], $contact->lead_source);
 	} else {
@@ -153,7 +153,7 @@ if(!empty($_REQUEST['birthdate'])){
    }
 
 
-$jsCalendarImage = SugarThemeRegistry::current()->getImageURL('jscalendar.gif');	
+$jsCalendarImage = SugarThemeRegistry::current()->getImageURL('jscalendar.gif');
 $ntc_date_format = $timedate->get_user_date_format();
 $cal_dateformat = $timedate->get_cal_date_format();
 $lbl_required_symbol = $app_strings['LBL_REQUIRED_SYMBOL'];
@@ -226,7 +226,7 @@ $form .= <<<EOQ
 		<td  nowrap>
 			<input name='{$prefix}birthdate' onblur="parseDate(this, '$cal_dateformat');" size='12' maxlength='10' id='${prefix}jscal_field' type="text" value="{$birthdate}">&nbsp;
 			<!--not_in_theme!--><img src="{$jsCalendarImage}" alt="{$app_strings['LBL_ENTER_DATE']}"  id="${prefix}jscal_trigger" align="absmiddle">
-		</td>		
+		</td>
 		</tr>
 
 EOQ;
@@ -256,7 +256,7 @@ EOQ;
 
 $form .= <<<EOQ
 		</table>
-		
+
 		<input type='hidden' name='${prefix}alt_address_street'  value='{$contact->alt_address_street}'>
 		<input type='hidden' name='${prefix}alt_address_city' value='{$contact->alt_address_city}'><input type='hidden' name='${prefix}alt_address_state'   value='{$contact->alt_address_state}'><input type='hidden' name='${prefix}alt_address_postalcode'   value='{$contact->alt_address_postalcode}'><input type='hidden' name='${prefix}alt_address_country'  value='{$contact->alt_address_country}'>
 		<input type='hidden' name='${prefix}do_not_call'  value='{$contact->do_not_call}'>
@@ -290,7 +290,7 @@ EOQ;
 	        $form .= "<input name='${prefix}old_portal_password' type='hidden' size='25'  value='' >";
 	    }
 	}
-	
+
 $form .= <<<EOQ
 			<script type="text/javascript">
 				Calendar.setup ({
@@ -298,9 +298,9 @@ $form .= <<<EOQ
 				});
 			</script>
 EOQ;
-	
-	
-	
+
+
+
 	$javascript = new javascript();
 	$javascript->setFormName($formname);
 	$javascript->setSugarBean(new Contact());
@@ -310,8 +310,8 @@ EOQ;
 
 	$form .=$javascript->getScript();
 	$mod_strings = $temp_strings;
-	
-  
+
+
 	return $form;
 }
 
@@ -418,12 +418,12 @@ return $the_form;
 
 function handleSave($prefix, $redirect=true, $useRequired=false){
 	global $theme, $current_user;
-	
-	
-	
-    
+
+
+
+
 	require_once('include/formbase.php');
-	
+
 	global $timedate;
 
 	$focus = new Contact();
@@ -431,7 +431,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 	if($useRequired &&  !checkRequired($prefix, array_keys($focus->required_fields))){
 		return null;
 	}
-	
+
 	if (!empty($_POST[$prefix.'new_reports_to_id'])) {
 		$focus->retrieve($_POST[$prefix.'new_reports_to_id']);
 		$focus->reports_to_id = $_POST[$prefix.'record'];
@@ -439,7 +439,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 
         $focus = populateFromPost($prefix, $focus);
         if( isset($_POST[$prefix.'old_portal_password']) && !empty($focus->portal_password) && $focus->portal_password != $_POST[$prefix.'old_portal_password']){
-            $focus->portal_password = md5($focus->portal_password);
+            $focus->portal_password = User::getPasswordHash($focus->portal_password);
         }
 		if (!isset($_POST[$prefix.'email_opt_out'])) $focus->email_opt_out = 0;
 		if (!isset($_POST[$prefix.'do_not_call'])) $focus->do_not_call = 0;
@@ -451,7 +451,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 	}
 	if($_REQUEST['action'] != 'BusinessCard' && $_REQUEST['action'] != 'ConvertLead' && $_REQUEST['action'] != 'ConvertProspect')
 	{
-		
+
 		if (!empty($_POST[$prefix.'sync_contact']) || !empty($focus->sync_contact)){
 			 $focus->contacts_users_id = $current_user->id;
 		}
@@ -472,7 +472,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 		$check_notify = FALSE;
 	}
 
-    
+
 	if (empty($_POST['record']) && empty($_POST['dup_checked'])) {
 
 		$duplicateContacts = $this->checkForDuplicates($prefix);
@@ -482,7 +482,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 			if(isset($_POST['inbound_email_id']) && !empty($_POST['inbound_email_id'])) {
 				$get .= '&inbound_email_id='.$_POST['inbound_email_id'];
 			}
-			
+
 			// Bug 25311 - Add special handling for when the form specifies many-to-many relationships
 			if(isset($_POST['relate_to']) && !empty($_POST['relate_to'])) {
 				$get .= '&Contactsrelate_to='.$_POST['relate_to'];
@@ -509,19 +509,19 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 			}
 
 			if($focus->hasCustomFields()) {
-				foreach($focus->field_defs as $name=>$field) {	
+				foreach($focus->field_defs as $name=>$field) {
 					if (!empty($field['source']) && $field['source'] == 'custom_fields')
 					{
 						$get .= "&Contacts$name=".urlencode($focus->$name);
-					}			    
+					}
 				}
-			}			
-			
-			
+			}
+
+
 			$emailAddress = new SugarEmailAddress();
 			$get .= $emailAddress->getFormBaseURL($focus);
 
-			
+
 			//create list of suspected duplicate contact id's in redirect get string
 			$i=0;
 			foreach ($duplicateContacts as $contact)
@@ -579,7 +579,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 	if(isset($_REQUEST['inbound_email_id']) && !empty($_REQUEST['inbound_email_id'])) {
 		// fake this case like it's already saved.
 		$focus->save($check_notify);
-		
+
 		$email = new Email();
 		$email->retrieve($_REQUEST['inbound_email_id']);
 		$email->parent_type = 'Contacts';
@@ -598,7 +598,7 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
 
 	$focus->save($check_notify);
 	$return_id = $focus->id;
-    
+
 	$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 
     if (!empty($_POST['is_ajax_call']) && $_POST['is_ajax_call'] == '1') {
@@ -607,13 +607,13 @@ function handleSave($prefix, $redirect=true, $useRequired=false){
                                  'get' => ''));
     	$trackerManager = TrackerManager::getInstance();
         $timeStamp = TimeDate::getInstance()->nowDb();
-        if($monitor = $trackerManager->getMonitor('tracker')){ 
+        if($monitor = $trackerManager->getMonitor('tracker')){
 	        $monitor->setValue('action', 'detailview');
 	        $monitor->setValue('user_id', $GLOBALS['current_user']->id);
 	        $monitor->setValue('module_name', 'Contacts');
 	        $monitor->setValue('date_modified', $timeStamp);
 	        $monitor->setValue('visible', 1);
-	
+
 	        if (!empty($this->bean->id)) {
 	            $monitor->setValue('item_id', $return_id);
 	            $monitor->setValue('item_summary', $focus->get_summary_text());
diff --git a/modules/Contacts/Popup_picker.php b/modules/Contacts/Popup_picker.php
index 0577e1cd..cc4546db 100644
--- a/modules/Contacts/Popup_picker.php
+++ b/modules/Contacts/Popup_picker.php
@@ -36,33 +36,12 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  ********************************************************************************/
 
 
-
-
-global $theme;
-
-
 require_once('modules/Contacts/ContactFormBase.php');
 
-
-
-
-
-
-
 class Popup_Picker
 {
-	
-	
-	/*
-	 * 
-	 */
-	function Popup_Picker()
-	{
-		
-	}
-	
 	/*
-	 * 
+	 *
 	 */
 	function _get_where_clause()
 	{
@@ -89,13 +68,13 @@ class Popup_Picker
 		global $app_strings;
 		global $currentModule;
 		global $sugar_version, $sugar_config;
-		
+
 		$output_html = '';
 		$where = '';
-		
+
 		$where = $this->_get_where_clause();
-		
-		
+
+
 		$formBase = new ContactFormBase();
 		if(isset($_REQUEST['doAction']) && $_REQUEST['doAction'] == 'save')
 		{
@@ -110,7 +89,7 @@ class Popup_Picker
 		$lbl_save_button_title = $app_strings['LBL_SAVE_BUTTON_TITLE'];
 		$lbl_save_button_key = $app_strings['LBL_SAVE_BUTTON_KEY'];
 		$lbl_save_button_label = $app_strings['LBL_SAVE_BUTTON_LABEL'];
-		
+
 		// TODO: cleanup the construction of $addform
 		$formbody = $formBase->getFormBody('','','EmailEditView');
 		$addform = '<table><tr><td nowrap="nowrap" valign="top">'
@@ -149,7 +128,7 @@ EOQ;
 		$form->assign('LAST_NAME', $last_name);
 		$form->assign('ACCOUNT_NAME', $account_name);
 		$form->assign('request_data', $request_data);
-		
+
 		// fill in for mass update
 		$button = "<input type='hidden' name='module' value='Contacts'>".
 		          "<input type='hidden' id='form_action' name='action' value='CloseContactAddressPopup'>".
@@ -157,13 +136,13 @@ EOQ;
 		          "<input type='hidden' name='delete' value='false'>".
 		          "<input type='hidden' name='mass' value='Array'>".
 		          "<input type='hidden' name='Update' value='Update'>";
-		          
+
 		if(isset($_REQUEST['mass']) && is_array($_REQUEST['mass'])) {
 			foreach(array_unique($_REQUEST['mass']) as $record) {
 				$button .= "<input style='display: none' checked type='checkbox' name='mass[]' value='$record'>\n";
-			}		
+			}
 		}
-		
+
 		$button .= "<input type='hidden' name='query' value='true'>";
 		$button .= "<input type='hidden' name='saved_associated_data' value=''>";
 		$button .= "<input type='hidden' name='close_window' value='true'>";
@@ -191,7 +170,7 @@ EOQ;
 		insert_popup_header($theme);
 		$output_html .= ob_get_contents();
 		ob_end_clean();
-				
+
 		// Reset the sections that are already in the page so that they do not print again later.
 		$form->reset('main.SearchHeader');
 
@@ -207,17 +186,17 @@ EOQ;
 		$ListView->setHeaderText($button);
 		$ListView->setQuery($where, '', '', 'CONTACT');
 		$ListView->setModStrings($mod_strings);
-		
+
 		ob_start();
 		$ListView->processListViewMulti($seed_bean, 'main', 'CONTACT');
 		$output_html .= ob_get_contents();
 		ob_end_clean();
-       
-        // Regular Expression to override sListView 
-        $exp = '/sListView.save_checks/si'; 
+
+        // Regular Expression to override sListView
+        $exp = '/sListView.save_checks/si';
         $change = 'save_checks';
         $output_html = preg_replace(array($exp), array($change), $output_html);
-        
+
 		$output_html .= <<<EOJS
         <script type="text/javascript">
         <!--
@@ -232,11 +211,11 @@ EOQ;
         }
         checked_items = Array();
         inputs_array = document.MassUpdate.elements;
-        
+
         for(wp = 0 ; wp < inputs_array.length; wp++) {
             if(inputs_array[wp].name == "mass[]" && inputs_array[wp].style.display == "none") {
                 checked_items.push(inputs_array[wp].value);
-            } 
+            }
         }
         for(i in checked_items) {
             for(wp = 0 ; wp < inputs_array.length; wp++) {
@@ -248,11 +227,11 @@ EOQ;
         -->
         </script>
 EOJS;
-		
+
 		$output_html .= insert_popup_footer();
 		return $output_html;
 	}
-	
+
 	function process_page_for_merge()
 	{
 		global $theme;
@@ -260,14 +239,12 @@ EOJS;
 		global $app_strings;
 		global $currentModule;
 		global $sugar_version, $sugar_config;
-		
+
 		$output_html = '';
 		$where = '';
-		
+
 		$where = $this->_get_where_clause();
-		
-		
-		
+
 		$first_name = empty($_REQUEST['first_name']) ? '' : $_REQUEST['first_name'];
 		$last_name = empty($_REQUEST['last_name']) ? '' : $_REQUEST['last_name'];
 		$account_name = empty($_REQUEST['account_name']) ? '' : $_REQUEST['account_name'];
@@ -310,15 +287,15 @@ EOJS;
 		insert_popup_header($theme);
 		$output_html .= ob_get_contents();
 		ob_end_clean();
-		
+
 		$output_html .= get_form_header($mod_strings['LBL_SEARCH_FORM_TITLE'], '', false);
-		
+
 		$form->parse('main.SearchHeader');
 		$output_html .= $form->text('main.SearchHeader');
-		
+
 		// Reset the sections that are already in the page so that they do not print again later.
 		$form->reset('main.SearchHeader');
-		
+
 		// create the listview
 		$seed_bean = new Contact();
 		$ListView = new ListView();
@@ -335,11 +312,12 @@ EOJS;
 		ob_start();
 		$output_html .= get_form_header($mod_strings['LBL_LIST_FORM_TITLE'], $button, false);
 				//BEGIN ATHENA CUSTOMIZATION - rsmith
-			$query = $_REQUEST['select'].' WHERE '.$_REQUEST['where']."'".$_REQUEST['id']."'";
-			
-			//$response = $seed_bean->process_list_query($_REQUEST['select'], 0, -1, -1, $_REQUEST['where']."'".$_REQUEST['id']."'");
-			
-			$result = $seed_bean->db->query($query,true,"Error retrieving $seed_bean->object_name list: ");
+        require_once('modules/MailMerge/merge_query.php');
+        $rel_module = empty($_REQUEST['rel_module'])?'': $_REQUEST['rel_module'];
+        $id = empty($_REQUEST['id'])?'': $_REQUEST['id'];
+
+		$query = get_merge_query($seed_bean, $rel_module, $id);
+		$result = $seed_bean->db->query($query,true,"Error retrieving $seed_bean->object_name list: ");
 
 			$list = Array();
 				while(($row = $seed_bean->db->fetchByAssoc($result)) != null)
@@ -347,33 +325,32 @@ EOJS;
 						$seed_bean = new Contact();
 						foreach($seed_bean->field_defs as $field=>$value)
 						{
-							if (isset($row[$field])) 
+							if (isset($row[$field]))
 							{
 								$seed_bean->$field = $row[$field];
 							}
-							else if (isset($row[$seed_bean->table_name .'.'.$field])) 
+							else if (isset($row[$seed_bean->table_name .'.'.$field]))
 							{
 								$seed_bean->$field = $row[$seed_bean->table_name .'.'.$field];
 							}
 							else
 							{
 								$seed_bean->$field = "";
-							}	
+							}
 						}
 						$seed_bean->fill_in_additional_list_fields();
 
 						$list[] = $seed_bean;
 			    	}
-					
+
 			$ListView->processListViewTwo($list, 'main', 'CONTACT');
 
 		//END ATHENA CUSTOMIZATION - rsmith
 		$output_html .= ob_get_contents();
 		ob_end_clean();
-				
+
 		$output_html .= insert_popup_footer();
 		return $output_html;
-		
+
 	}
 }
-?>
\ No newline at end of file
diff --git a/modules/Contacts/metadata/quickcreatedefs.php b/modules/Contacts/metadata/quickcreatedefs.php
index badc7264..210250ce 100644
--- a/modules/Contacts/metadata/quickcreatedefs.php
+++ b/modules/Contacts/metadata/quickcreatedefs.php
@@ -83,6 +83,8 @@ $viewdefs = array (
 
             array (
               'name' => 'first_name',
+                'customCode' => '{html_options name="salutation" id="salutation" options=$fields.salutation.options selected=$fields.salutation.value}'
+                . '&nbsp;<input name="first_name" id="first_name" size="25" maxlength="25" type="text" value="{$fields.first_name.value}">',
             ),
 
             array (
diff --git a/modules/Contacts/tpls/QuickCreate.tpl b/modules/Contacts/tpls/QuickCreate.tpl
index e0aab4dc..f47b3687 100644
--- a/modules/Contacts/tpls/QuickCreate.tpl
+++ b/modules/Contacts/tpls/QuickCreate.tpl
@@ -51,8 +51,8 @@
 <input type="hidden" name="return_action" value="{$smarty.request.return_action}">
 <input type="hidden" name="return_id" value="{$smarty.request.return_id}">
 <input type="hidden" name="contact_role">
-{if !empty($smarty.request.return_module)}
-<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif empty($isDCForm)}{$smarty.request.return_module}{/if}">
+{if !empty($smarty.request.return_module) || !empty($smarty.request.relate_to)}
+<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif $smarty.request.relate_to && empty($smarty.request.from_dcmenu)}{$smarty.request.relate_to}{elseif empty($isDCForm) && empty($smarty.request.from_dcmenu)}{$smarty.request.return_module}{/if}">
 <input type="hidden" name="relate_id" value="{$smarty.request.return_id}">
 {/if}
 <input type="hidden" name="offset" value="{$offset}">
diff --git a/modules/Contacts/vardefs.php b/modules/Contacts/vardefs.php
index 5a02b7a8..3d2ed88c 100644
--- a/modules/Contacts/vardefs.php
+++ b/modules/Contacts/vardefs.php
@@ -131,7 +131,7 @@ array (
 			),
 			'vname' =>'LBL_ANY_EMAIL',
 			'studio' => array('visible'=>false, 'searchview'=>true),
-		),	
+		),
 	'opportunity_role' =>
 		array(
 			'name' => 'opportunity_role',
diff --git a/modules/Contacts/views/view.edit.php b/modules/Contacts/views/view.edit.php
index 7bbbde4c..1b2efc9a 100644
--- a/modules/Contacts/views/view.edit.php
+++ b/modules/Contacts/views/view.edit.php
@@ -75,6 +75,10 @@ class ContactsViewEdit extends ViewEdit
                $this->ev->focus->portal_name = '';
                $this->ev->focus->portal_password = '';
                $this->ev->focus->portal_acitve = 0;
+           }
+           else {
+               $this->ev->fieldDefs['portal_password']['value'] = '';
+               $this->ev->fieldDefs['portal_password1']['value'] = '';               
            }
 		   echo getVersionedScript('modules/Contacts/Contact.js');
 		   echo '<script language="javascript">';
diff --git a/modules/Currencies/Currency.php b/modules/Currencies/Currency.php
index 2fb7f267..c5eaa6d5 100644
--- a/modules/Currencies/Currency.php
+++ b/modules/Currencies/Currency.php
@@ -387,6 +387,7 @@ function format_number($amount, $round = null, $decimals = null, $params = array
 
 		if($checkAmount >= 1000 || $checkAmount <= -1000) {
 			$amount = round(($amount / 1000), 0);
+			$amount = number_format($amount, 0, $dec_sep, $num_grp_sep); // add for SI bug 52498
 			$amount = $amount . 'k';
 			$amount = format_place_symbol($amount, $symbol,(empty($params['symbol_space']) ? false : true));
 		} else {
@@ -529,7 +530,7 @@ function toString($echo = true) {
 
 function getCurrencyDropDown($focus, $field='currency_id', $value='', $view='DetailView'){
     $view = ucfirst($view);
-	if($view == 'EditView' || $view == 'MassUpdate' || $view == 'QuickCreate'){
+	if($view == 'EditView' || $view == 'MassUpdate' || $view == 'QuickCreate' || $view == 'ConvertLead'){
         if ( isset($_REQUEST[$field]) && !empty($_REQUEST[$field]) ) {
             $value = $_REQUEST[$field];
 	    } elseif ( empty($focus->id) ) {
@@ -553,7 +554,12 @@ function getCurrencyDropDown($focus, $field='currency_id', $value='', $view='Det
         $selectCurrency = $currency->getSelectOptions($value);
 
 		$currency->setCurrencyFields($currency_fields);
-		$html = '<select name="'. $field. '" id="' . $field  . '_select" ';
+		$html = '<select name="';
+		// If it's a lead conversion (ConvertLead view), add the module_name before the $field
+		if ($view == "ConvertLead") {
+			$html .= $focus->module_name;
+		}
+		$html .= $field. '" id="' . $field  . '_select" ';
 		if($view != 'MassUpdate')
 			$html .= 'onchange="CurrencyConvertAll(this.form);"';
 		$html .= '>'. $selectCurrency . '</select>';
diff --git a/modules/DynamicFields/templates/Fields/Forms/enum.tpl b/modules/DynamicFields/templates/Fields/Forms/enum.tpl
index c62f4fb0..ab450a6d 100644
--- a/modules/DynamicFields/templates/Fields/Forms/enum.tpl
+++ b/modules/DynamicFields/templates/Fields/Forms/enum.tpl
@@ -45,8 +45,8 @@
 <tr>
 	<td class='mbLBL'>{sugar_translate module="DynamicFields" label="LBL_DROP_DOWN_LIST"}:</td>
 	<td>
-	{if $hideLevel < 5}
-		{html_options name="options" id="options" selected=$selected_dropdown values=$dropdowns output=$dropdowns onChange="ModuleBuilder.dropdownChanged(this.value);"}<br><input type='button' value='{sugar_translate module="DynamicFields" label="LBL_BTN_EDIT"}' class='button' onclick="ModuleBuilder.moduleDropDown(this.form.options.value, this.form.options.value);">&nbsp;<input type='button' value='{sugar_translate module="DynamicFields" label="LBL_BTN_ADD"}' class='button' onclick="ModuleBuilder.moduleDropDown('', this.form.name.value);">
+	{if $hideLevel < 5 && empty($vardef.function)}
+		{html_options name="options" id="options" selected=$selected_dropdown values=$dropdowns output=$dropdowns onChange="ModuleBuilder.dropdownChanged(this.value);"}{if !$uneditable}<br><input type='button' value='{sugar_translate module="DynamicFields" label="LBL_BTN_EDIT"}' class='button' onclick="ModuleBuilder.moduleDropDown(this.form.options.value, this.form.options.value);">&nbsp;<input type='button' value='{sugar_translate module="DynamicFields" label="LBL_BTN_ADD"}' class='button' onclick="ModuleBuilder.moduleDropDown('', this.form.name.value);">{/if}
 	{else}
 		<input type='hidden' name='options' value='{$selected_dropdown}'>{$selected_dropdown}
 	{/if}
@@ -55,7 +55,7 @@
 <tr>
 	<td class='mbLBL'>{sugar_translate module="DynamicFields" label="COLUMN_TITLE_DEFAULT_VALUE"}:</td>
 	<td>
-	{if $hideLevel < 5}
+	{if $hideLevel < 5 && empty($vardef.function)}
 		{html_options name="default[]" id="default[]" selected=$selected_options options=$default_dropdowns multiple=$multi}
 	{else}
 		<input type='hidden' name='default[]' id='default[]' value='$vardef.default'>{$vardef.default}
diff --git a/modules/DynamicFields/templates/Fields/TemplateField.php b/modules/DynamicFields/templates/Fields/TemplateField.php
index 077ccba4..c82dc90a 100644
--- a/modules/DynamicFields/templates/Fields/TemplateField.php
+++ b/modules/DynamicFields/templates/Fields/TemplateField.php
@@ -335,6 +335,7 @@ class TemplateField{
 			'type'=>$this->type,
 			'massupdate'=>$this->massupdate,
 			'default'=>$this->default,
+            'no_default'=> !empty($this->no_default),
 			'comments'=> (isset($this->comments)) ? $this->comments : '',
 		    'help'=> (isset($this->help)) ?  $this->help : '',
 		    'importable'=>$this->importable,
diff --git a/modules/EAPM/controller.php b/modules/EAPM/controller.php
index b1fbea56..99a0c904 100644
--- a/modules/EAPM/controller.php
+++ b/modules/EAPM/controller.php
@@ -108,6 +108,9 @@ class EAPMController extends SugarController
         if($this->return_module == 'Import'){
             $this->set_redirect("index.php?module=Import&action=Step1&import_module=". $this->return_action . "&application=" . $this->bean->application);
         }
+        if($this->module == 'EAPM') {
+            $this->set_redirect('index.php?module=Users&action=EditView&record=' . $_POST['assigned_user_id']);
+        }
         // Override the redirect location to add the hash
         $this->redirect_url = $this->redirect_url.'#tab5';
         if ( $this->api->authMethod == 'oauth' && !$this->bean->deleted ) {
diff --git a/modules/EmailMan/EmailMan.php b/modules/EmailMan/EmailMan.php
index 1fbfbb5a..6b6bcd25 100644
--- a/modules/EmailMan/EmailMan.php
+++ b/modules/EmailMan/EmailMan.php
@@ -309,9 +309,10 @@ class EmailMan extends SugarBean{
      * @param string from_address Email address of the sender, usually email address of the configured inbox.
      * @param string sender_id If of the user sending the campaign.
      * @param array  macro_nv array of name value pair, one row for each replacable macro in email template text.
+     * @param string from_address_name The from address eg markeing <marketing@sugar.net>
      * @return
      */
-    function create_ref_email($marketing_id,$subject,$body_text,$body_html,$campagin_name,$from_address,$sender_id,$notes,$macro_nv,$newmessage) {
+    function create_ref_email($marketing_id,$subject,$body_text,$body_html,$campagin_name,$from_address,$sender_id,$notes,$macro_nv,$newmessage,$from_address_name) {
 
        global $mod_Strings, $timedate;
        $upd_ref_email=false;
@@ -344,6 +345,7 @@ class EmailMan extends SugarBean{
                 $this->ref_email->description_html = $body_html;
                 $this->ref_email->description = $body_text;
                 $this->ref_email->from_addr = $from_address;
+                $this->ref_email->from_addr_name = $from_address_name;
                 $this->ref_email->assigned_user_id = $sender_id;
                 if ($this->test) {
                     $this->ref_email->parent_type = 'test';
@@ -836,6 +838,9 @@ class EmailMan extends SugarBean{
                     $email_id=$this->create_indiv_email($module,$mail);
                 } else {
                     //find/create reference email record. all campaign targets reveiving this message will be linked with this message.
+                    $decodedFromName = mb_decode_mimeheader($this->current_emailmarketing->from_name);
+                    $fromAddressName= "{$decodedFromName} <{$this->mailbox_from_addr}>";
+
                     $email_id=$this->create_ref_email($this->marketing_id,
                                             $this->current_emailtemplate->subject,
                                             $this->current_emailtemplate->body,
@@ -845,7 +850,8 @@ class EmailMan extends SugarBean{
                                             $this->user_id,
                                             $this->notes_array,
                                             $macro_nv,
-                                            $this->newmessage
+                                            $this->newmessage,
+                                            $fromAddressName
                      );
                     $this->newmessage = false;
                 }
diff --git a/modules/EmailMan/tpls/config.tpl b/modules/EmailMan/tpls/config.tpl
index 1d0bf068..36077de8 100644
--- a/modules/EmailMan/tpls/config.tpl
+++ b/modules/EmailMan/tpls/config.tpl
@@ -663,18 +663,20 @@ function changeEmailScreenDisplay(smtptype, clear)
         document.getElementById("mail_smtpuser_label").innerHTML = '{/literal}{$MOD.LBL_YAHOOMAIL_SMTPUSER}{literal}';
         break;
     case "gmail":
-        document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
-        document.getElementById("mail_smtpport").value = '587';
-        document.getElementById("mail_smtpauth_req").checked = true;
-        var ssl = document.getElementById("mail_smtpssl");
-        for(var j=0;j<ssl.options.length;j++) {
-            if(ssl.options[j].text == 'TLS') {
-                ssl.options[j].selected = true;
-                break;
+        if(document.getElementById("mail_smtpserver").value == "" || document.getElementById("mail_smtpserver").value == 'plus.smtp.mail.yahoo.com') {
+            document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
+            document.getElementById("mail_smtpport").value = '587';
+            document.getElementById("mail_smtpauth_req").checked = true;
+            var ssl = document.getElementById("mail_smtpssl");
+            for(var j=0;j<ssl.options.length;j++) {
+                if(ssl.options[j].text == 'TLS') {
+                    ssl.options[j].selected = true;
+                    break;
+                }
             }
         }
-        document.getElementById("mailsettings1").style.display = 'none';
-        document.getElementById("mailsettings2").style.display = 'none';
+        //document.getElementById("mailsettings1").style.display = 'none';
+        //document.getElementById("mailsettings2").style.display = 'none';
         document.getElementById("mail_smtppass_label").innerHTML = '{/literal}{$MOD.LBL_GMAIL_SMTPPASS}{literal}';
         document.getElementById("mail_smtpuser_label").innerHTML = '{/literal}{$MOD.LBL_GMAIL_SMTPUSER}{literal}';
         break;
diff --git a/modules/EmailTemplates/AttachFiles.php b/modules/EmailTemplates/AttachFiles.php
index 4c3b3cab..2d48d1e2 100644
--- a/modules/EmailTemplates/AttachFiles.php
+++ b/modules/EmailTemplates/AttachFiles.php
@@ -44,9 +44,6 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 require_once('include/JSON.php');
 require_once('include/upload_file.php');
 
-$GLOBALS['log']->debug(print_r($_FILES, true));
-         $file_ext_allow = FALSE;
-
 if (!is_dir($cachedir = sugar_cached('images/')))
     mkdir_recursive($cachedir);
 
@@ -56,11 +53,21 @@ $imgType = array('image/gif', 'image/png', 'image/x-png', 'image/bmp', 'image/jp
 $ret = array();
 
 foreach($_FILES as $k => $file) {
-	if(in_array(strtolower($_FILES[$k]['type']), $imgType)) {
-		$dest = $cachedir.$_FILES[$k]['name'];
-		if(is_uploaded_file($_FILES[$k]['tmp_name'])) {
-			move_uploaded_file($_FILES[$k]['tmp_name'], $dest);
-		    $ret[] = $dest;
+	if(in_array(strtolower($_FILES[$k]['type']), $imgType) && $_FILES[$k]['size'] > 0) {
+	    $upload_file = new UploadFile($k);
+		// check the file
+		if($upload_file->confirm_upload()) {
+		    $dest = $cachedir.basename($upload_file->get_stored_file_name()); // target name
+		    $guid = create_guid();
+		    if($upload_file->final_move($guid)) { // move to uploads
+		        $path = $upload_file->get_upload_path($guid);
+		        // if file is OK, copy to cache
+		        if(verify_uploaded_image($path) && copy($path, $dest)) {
+		            $ret[] = $dest;
+		        }
+		        // remove temp file
+		        unlink($path);
+		    }
 		}
 	}
 }
@@ -70,5 +77,3 @@ if (!empty($ret)) {
 	echo $json->encode($ret);
 	//return the parameters
 }
-
-?>
diff --git a/modules/EmailTemplates/EmailTemplate.php b/modules/EmailTemplates/EmailTemplate.php
index 90b87a19..73c00509 100644
--- a/modules/EmailTemplates/EmailTemplate.php
+++ b/modules/EmailTemplates/EmailTemplate.php
@@ -429,29 +429,37 @@ class EmailTemplate extends SugarBean {
 			if(($field_def['type'] == 'relate' && empty($field_def['custom_type'])) || $field_def['type'] == 'assigned_user_name') {
          		continue;
 			}
-			$repl_arr["contact_".$field_def['name']] = '';
-			$repl_arr["contact_account_".$field_def['name']] = '';
+            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                'contact_'         . $field_def['name'] => '',
+                'contact_account_' . $field_def['name'] => '',
+            ));
 		}
 		foreach($prospect->field_defs as $field_def) {
 			if(($field_def['type'] == 'relate' && empty($field_def['custom_type'])) || $field_def['type'] == 'assigned_user_name') {
          		continue;
 			}
-			$repl_arr["contact_".$field_def['name']] = '';
-			$repl_arr["contact_account_".$field_def['name']] = '';
+            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                'contact_'         . $field_def['name'] => '',
+                'contact_account_' . $field_def['name'] => '',
+            ));
 		}
 		foreach($contact->field_defs as $field_def) {
 			if(($field_def['type'] == 'relate' && empty($field_def['custom_type'])) || $field_def['type'] == 'assigned_user_name') {
          		continue;
 			}
-			$repl_arr["contact_".$field_def['name']] = '';
-			$repl_arr["contact_account_".$field_def['name']] = '';
+            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                'contact_'         . $field_def['name'] => '',
+                'contact_account_' . $field_def['name'] => '',
+            ));
 		}
 		foreach($acct->field_defs as $field_def) {
 			if(($field_def['type'] == 'relate' && empty($field_def['custom_type'])) || $field_def['type'] == 'assigned_user_name') {
          		continue;
 			}
-			$repl_arr["account_".$field_def['name']] = '';
-			$repl_arr["account_contact_".$field_def['name']] = '';
+            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                'account_'         . $field_def['name'] => '',
+                'account_contact_' . $field_def['name'] => '',
+            ));
 		}
 		// cn: end bug 9277 fix
 
@@ -473,17 +481,23 @@ class EmailTemplate extends SugarBean {
 						$translated = translate($field_def['options'], 'Accounts' ,$acct->$field_def['name']);
 
 						if(isset($translated) && ! is_array($translated)) {
-							$repl_arr["account_".$field_def['name']] = $translated;
-							$repl_arr["contact_account_".$field_def['name']] = $translated;
+                            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                                'account_'         . $field_def['name'] => $translated,
+                                'contact_account_' . $field_def['name'] => $translated,
+                            ));
 						} else { // unset enum field, make sure we have a match string to replace with ""
-							$repl_arr["account_".$field_def['name']] = '';
-							$repl_arr["contact_account_".$field_def['name']] = '';
+                            $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                                'account_'         . $field_def['name'] => '',
+                                'contact_account_' . $field_def['name'] => '',
+                            ));
 						}
 					} else {
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'],$acct->$field_def['name']);
-						$repl_arr["account_".$field_def['name']] = $translated;
-						$repl_arr["contact_account_".$field_def['name']] = $translated;
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            'account_'         . $field_def['name'] => $translated,
+                            'contact_account_' . $field_def['name'] => $translated,
+                        ));
 					}
 				}
 			}
@@ -511,18 +525,24 @@ class EmailTemplate extends SugarBean {
 					$translated = translate($field_def['options'], 'Accounts' ,$contact->$field_def['name']);
 
 					if(isset($translated) && ! is_array($translated)) {
-						$repl_arr["contact_".$field_def['name']] = $translated;
-						$repl_arr["contact_account_".$field_def['name']] = $translated;
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            'contact_'         . $field_def['name'] => $translated,
+                            'contact_account_' . $field_def['name'] => $translated,
+                        ));
 					} else { // unset enum field, make sure we have a match string to replace with ""
-						$repl_arr["contact_".$field_def['name']] = '';
-						$repl_arr["contact_account_".$field_def['name']] = '';
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            'contact_'         . $field_def['name'] => '',
+                            'contact_account_' . $field_def['name'] => '',
+                        ));
 					}
 				} else {
 					if (isset($contact->$field_def['name'])) {
                         // bug 47647 - allow for fields to translate before adding to template
                         $translated = self::_convertToType($field_def['type'],$contact->$field_def['name']);
-						$repl_arr["contact_".$field_def['name']] = $translated;
-						$repl_arr["contact_account_".$field_def['name']] = $translated;
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            'contact_'         . $field_def['name'] => $translated,
+                            'contact_account_' . $field_def['name'] => $translated,
+                        ));
 					} // if
 				}
 			}
@@ -540,19 +560,29 @@ class EmailTemplate extends SugarBean {
 					$translated = translate($field_def['options'],$bean_name,$focus->$field_def['name']);
 
 					if(isset($translated) && ! is_array($translated)) {
-						$repl_arr[strtolower($beanList[$bean_name])."_".$field_def['name']] = $translated;
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            strtolower($beanList[$bean_name])."_".$field_def['name'] => $translated,
+                        ));
 					} else { // unset enum field, make sure we have a match string to replace with ""
-						$repl_arr[strtolower($beanList[$bean_name])."_".$field_def['name']] = '';
+                        $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                            strtolower($beanList[$bean_name])."_".$field_def['name'] => '',
+                        ));
 					}
 				} else {
                     // bug 47647 - translate currencies to appropriate values
-					$repl_arr[strtolower($beanList[$bean_name])."_".$field_def['name']] = self::_convertToType($field_def['type'],$focus->$field_def['name']);
+                    $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                        strtolower($beanList[$bean_name])."_".$field_def['name'] => self::_convertToType($field_def['type'],$focus->$field_def['name']),
+                    ));
 				}
 			} else {
 				if($field_def['name'] == 'full_name') {
-					$repl_arr[strtolower($beanList[$bean_name]).'_full_name'] = $focus->get_summary_text();
+                    $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                        strtolower($beanList[$bean_name]).'_full_name' => $focus->get_summary_text(),
+                    ));
 				} else {
-					$repl_arr[strtolower($beanList[$bean_name])."_".$field_def['name']] = '';
+                    $repl_arr = EmailTemplate::add_replacement($repl_arr, $field_def, array(
+                        strtolower($beanList[$bean_name])."_".$field_def['name'] => '',
+                    ));
 				}
 			}
 		} // end foreach()
@@ -578,6 +608,27 @@ class EmailTemplate extends SugarBean {
 		return $string;
 	}
 
+    /**
+     * Add replacement(s) to the collection based on field definition
+     *
+     * @param array $data
+     * @param array $field_def
+     * @param array $replacement
+     * @return array
+     */
+    protected static function add_replacement($data, $field_def, $replacement)
+    {
+        foreach ($replacement as $key => $value)
+        {
+            // @see defect #48641
+            if ('multienum' == $field_def['type']) {
+                $value = implode(', ', unencodeMultienum($value));
+            }
+            $data[$key] = $value;
+        }
+        return $data;
+    }
+
 	function parse_template($string, &$bean_arr) {
 		global $beanFiles, $beanList;
 
diff --git a/modules/EmailTemplates/EmailTemplateFormBase.php b/modules/EmailTemplates/EmailTemplateFormBase.php
index a99c0a65..4df07c09 100644
--- a/modules/EmailTemplates/EmailTemplateFormBase.php
+++ b/modules/EmailTemplates/EmailTemplateFormBase.php
@@ -166,7 +166,11 @@ EOQ;
 			preg_match_all('#<img[^>]*[\s]+src[^=]*=[\s]*["\']cache/images/(.+?)["\']#si', $emailTemplateBodyHtml, $matches);
 			foreach($matches[1] as $match) {
 				$filename = urldecode($match);
-
+                if($filename != pathinfo($filename, PATHINFO_BASENAME)) {
+                    // don't allow paths there
+                    $emailTemplateBodyHtml = str_replace("cache/images/$match", "", $emailTemplateBodyHtml);
+                    continue;
+                }
 				$file_location = sugar_cached("images/{$filename}");
 				$mime_type = pathinfo($filename, PATHINFO_EXTENSION);
 
@@ -351,7 +355,7 @@ EOQ;
 	///////////////////////////////////////////////////////////////////////////////
 
         clear_register_value('select_array', $focus->object_name);
-        
+
 		if($redirect) {
 		$GLOBALS['log']->debug("Saved record with id of ".$return_id);
 			handleRedirect($return_id, "EmailTemplates");
diff --git a/modules/EmailTemplates/PopupDocumentsCampaignTemplate.html b/modules/EmailTemplates/PopupDocumentsCampaignTemplate.html
index e0e2e031..c8959c8a 100644
--- a/modules/EmailTemplates/PopupDocumentsCampaignTemplate.html
+++ b/modules/EmailTemplates/PopupDocumentsCampaignTemplate.html
@@ -91,7 +91,7 @@
 {PAGINATION}
 <!-- END: list_nav_row -->
 	<tr height="20" >
-		<td scope="col" width="33%"  nowrap="nowrap"><a href="{ORDER_BY}document_name" class="listViewThLinkS1">{MOD.LBL_LIST_DOCUMENT}{arrow_start}{name_arrow}{arrow_end}</a></td>
+		<td scope="col" width="33%"  nowrap="nowrap"><a href="{ORDER_BY}document_name" class="listViewThLinkS1">{MOD.LBL_LIST_DOCUMENT}{arrow_start}{document_name_arrow}{arrow_end}</a></td>
 		<td scope="col" width="33%"  nowrap="nowrap">{MOD.LBL_LIST_REVISION}</td>
 		<td scope="col" width="34%"  nowrap="nowrap">{MOD.LBL_LIST_STATUS}</td>
 	</tr>
diff --git a/modules/EmailTemplates/PopupDocumentsCampaignTemplate.php b/modules/EmailTemplates/PopupDocumentsCampaignTemplate.php
index 23467862..7710201a 100644
--- a/modules/EmailTemplates/PopupDocumentsCampaignTemplate.php
+++ b/modules/EmailTemplates/PopupDocumentsCampaignTemplate.php
@@ -91,7 +91,9 @@ $form->assign('THEME', $theme);
 $form->assign('MODULE_NAME', $currentModule);
 $form->assign('NAME', $name);
 $form->assign('DOCUMENT_NAME', $document_name);
-$form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+if(isset($_REQUEST['target'])) $form->assign('DOCUMENT_TARGET', $_REQUEST['target']);
+else $form->assign('DOCUMENT_TARGET', '');
+
 $form->assign('DOCUMENT_REVISION_ID', $document_revision_id);
 
 $form->assign("CATEGORY_OPTIONS", get_select_options_with_id($app_list_strings['document_category_dom'], $category_id));
diff --git a/modules/Emails/Delete.php b/modules/Emails/Delete.php
index ff81be54..5d20c21a 100644
--- a/modules/Emails/Delete.php
+++ b/modules/Emails/Delete.php
@@ -63,7 +63,7 @@ if (!isset($_REQUEST['assigned_user_id'])) {
 
 if ($email_type == 'archived') {
 	global $current_user;
-	$loc = 'Location: index.php?module=Emails&action=ListView&all=true';
+    $loc = 'Location: index.php?module=Emails';
 } else {
 $loc = 'Location: index.php?module='.$_REQUEST['return_module'].'&action='.$_REQUEST['return_action'].'&record='.$_REQUEST['return_id'].'&type='.$_REQUEST['type'].'&assigned_user_id='.$_REQUEST['assigned_user_id'];
 }
diff --git a/modules/Emails/Email.php b/modules/Emails/Email.php
index 1562cc1a..9beea1c3 100644
--- a/modules/Emails/Email.php
+++ b/modules/Emails/Email.php
@@ -142,6 +142,13 @@ class Email extends SugarBean {
 	// prefix to use when importing inlinge images in emails
 	public $imagePrefix;
 
+    /**
+     * Used for keeping track of field defs that have been modified
+     *
+     * @var array
+     */
+    public $modifiedFieldDefs = array();
+
 	/**
 	 * sole constructor
 	 */
@@ -903,7 +910,7 @@ class Email extends SugarBean {
 		}
 
 		if(!empty($request['fromAccount'])) {
-			if (isset($ie->id) && !$ie->isPop3Protocol()) {
+			if (isset($ie->id) && !$ie->isPop3Protocol() && $mail->oe->mail_smtptype != 'gmail') {
 				$sentFolder = $ie->get_stored_options("sentFolder");
 				if (!empty($sentFolder)) {
 					$data = $mail->CreateHeader() . "\r\n" . $mail->CreateBody() . "\r\n";
@@ -1007,6 +1014,8 @@ class Email extends SugarBean {
 	///////////////////////////////////////////////////////////////////////////
 	////	SAVERS
 	function save($check_notify = false) {
+        global $current_user;
+
 		if($this->isDuplicate) {
 			$GLOBALS['log']->debug("EMAIL - tried to save a duplicate Email record");
 		} else {
@@ -1031,7 +1040,7 @@ class Email extends SugarBean {
 			//Bug 39503 - SugarBean is not setting date_sent when seconds missing
  			if(empty($this->date_sent)) {
 				global $timedate;
-				$date_sent_obj = $timedate->fromString($this->date_start." ".$this->time_start);
+				$date_sent_obj = $timedate->fromUser($timedate->merge_date_time($this->date_start, $this->time_start), $current_user);
                  if (!empty($date_sent_obj) && ($date_sent_obj instanceof SugarDateTime)) {
  				    $this->date_sent = $date_sent_obj->asDb();
                  }
@@ -2518,8 +2527,8 @@ class Email extends SugarBean {
             'flagged' => 'flagged'
         );
 
-	     $sort = !empty($_REQUEST['sort']) ? $_REQUEST['sort'] : "";
-         $direction = !empty($_REQUEST['dir']) ? $_REQUEST['dir'] : "";
+	     $sort = !empty($_REQUEST['sort']) ? $this->db->getValidDBName($_REQUEST['sort']) : "";
+         $direction = !empty($_REQUEST['dir'])  && in_array(strtolower($_REQUEST['dir']), array("asc", "desc")) ? $_REQUEST['dir'] : "";
 
          $order = ( !empty($sort) && !empty($direction) ) ? " ORDER BY {$hrSortLocal[$sort]} {$direction}" : "";
 
@@ -2528,6 +2537,7 @@ class Email extends SugarBean {
 
 		//Perform a count query needed for pagination.
 		$countQuery = $this->create_list_count_query($fullQuery);
+		
 		$count_rs = $this->db->query($countQuery, false, 'Error executing count query for imported emails search');
 		$count_row = $this->db->fetchByAssoc($count_rs);
 		$total_count = ($count_row != null) ? $count_row['c'] : 0;
@@ -2615,14 +2625,16 @@ class Email extends SugarBean {
         //Handle from and to addr joins
         if( !empty($_REQUEST['from_addr']) )
         {
+            $from_addr = $this->db->quote(strtolower($_REQUEST['from_addr']));
             $query['joins'] .= "INNER JOIN emails_email_addr_rel er_from ON er_from.email_id = emails.id AND er_from.deleted = 0 INNER JOIN email_addresses ea_from ON ea_from.id = er_from.email_address_id
-                                AND er_from.address_type='from' AND ea_from.email_address='" . strtolower($_REQUEST['from_addr']) . "'";
+                                AND er_from.address_type='from' AND emails_text.from_addr LIKE '%" . $from_addr . "%'";
         }
 
         if( !empty($_REQUEST['to_addrs'])  )
         {
+            $to_addrs = $this->db->quote(strtolower($_REQUEST['to_addrs']));
             $query['joins'] .= "INNER JOIN emails_email_addr_rel er_to ON er_to.email_id = emails.id AND er_to.deleted = 0 INNER JOIN email_addresses ea_to ON ea_to.id = er_to.email_address_id
-                                    AND er_to.address_type='to' AND ea_to.email_address='" . strtolower($_REQUEST['to_addrs']) . "'";
+                                    AND er_to.address_type='to' AND ea_to.email_address LIKE '%" . $to_addrs . "%'";
         }
 
         $query['where'] = " WHERE (emails.type= 'inbound' OR emails.type='archived' OR emails.type='out') AND emails.deleted = 0 ";
@@ -2638,7 +2650,7 @@ class Email extends SugarBean {
              $query['where'] .= " AND NOT EXISTS ( SELECT id FROM notes n WHERE n.parent_id = emails.id AND n.deleted = 0 AND n.filename is not null )";
 
         $fullQuery = "SELECT " . $query['select'] . " " . $query['joins'] . " " . $query['where'];
-
+        
         return $fullQuery;
     }
         /**
@@ -2654,8 +2666,8 @@ class Email extends SugarBean {
             unset($_REQUEST['assigned_user_id']);
 
         $availableSearchParam = array('name' => array('table_name' =>'emails'),
-                                        'data_parent_id_search' => array('table_name' =>'emails','db_key' => 'parent_id','opp' => '='),
-                                        'assigned_user_id' => array('table_name' => 'emails', 'opp' => '=') );
+                                      'data_parent_id_search' => array('table_name' =>'emails','db_key' => 'parent_id','opp' => '='),
+                                      'assigned_user_id' => array('table_name' => 'emails', 'opp' => '=') );
 
 		$additionalWhereClause = array();
 		foreach ($availableSearchParam as $key => $properties)
@@ -2663,15 +2675,17 @@ class Email extends SugarBean {
 		      if( !empty($_REQUEST[$key]) )
 		      {
 		          $db_key =  isset($properties['db_key']) ? $properties['db_key'] : $key;
-		          $searchValue = $_REQUEST[$key];
+                  $searchValue = $this->db->quote($_REQUEST[$key]);
 
 		          $opp = isset($properties['opp']) ? $properties['opp'] : 'like';
 		          if($opp == 'like')
-		              $searchValue = $searchValue . "%";
+		              $searchValue = "%" . $searchValue . "%";
 
 		          $additionalWhereClause[] = "{$properties['table_name']}.$db_key $opp '$searchValue' ";
 		      }
         }
+        
+        
 
         $isDateFromSearchSet = !empty($_REQUEST['searchDateFrom']);
         $isdateToSearchSet = !empty($_REQUEST['searchDateTo']);
@@ -3038,4 +3052,56 @@ eoq;
                 $this->cid2Link($a['id'], $a['file_mime_type']);
             }
     	}
+
+    /**
+     * Bugs 50972, 50973
+     * Sets the field def for a field to allow null values
+     *
+     * @todo Consider moving to SugarBean to allow other models to set fields to NULL
+     * @param string $field The field name to modify
+     * @return void
+     */
+    public function setFieldNullable($field)
+    {
+        if (isset($this->field_defs[$field]) && is_array($this->field_defs[$field]))
+        {
+            if (empty($this->modifiedFieldDefs[$field]))
+            {
+                if (
+                    isset($this->field_defs[$field]['isnull']) &&
+                    (strtolower($this->field_defs[$field]['isnull']) == 'false' || $this->field_defs[$field]['isnull'] === false)
+                )
+                {
+                    $this->modifiedFieldDefs[$field]['isnull'] = $this->field_defs[$field]['isnull'];
+                    unset($this->field_defs[$field]['isnull']);
+                }
+
+                if (isset($this->field_defs[$field]['dbType']) && $this->field_defs[$field]['dbType'] == 'id')
+                {
+                    $this->modifiedFieldDefs[$field]['dbType'] = $this->field_defs[$field]['dbType'];
+                    unset($this->field_defs[$field]['dbType']);
+                }
+            }
+        }
+    }
+
+    /**
+     * Bugs 50972, 50973
+     * Set the field def back to the way it was prior to modification
+     *
+     * @param $field
+     * @return void
+     */
+    public function revertFieldNullable($field)
+    {
+        if (!empty($this->modifiedFieldDefs[$field]) && is_array($this->modifiedFieldDefs[$field]))
+        {
+            foreach ($this->modifiedFieldDefs[$field] as $k => $v)
+            {
+                $this->field_defs[$field][$k] = $v;
+            }
+
+            unset($this->modifiedFieldDefs[$field]);
+            }
+    	}
 } // end class def
diff --git a/modules/Emails/EmailUI.php b/modules/Emails/EmailUI.php
index cbea1b88..2937473d 100644
--- a/modules/Emails/EmailUI.php
+++ b/modules/Emails/EmailUI.php
@@ -1532,6 +1532,14 @@ eoq;
 				$email = new Email();
 				$email->retrieve($id);
 
+                // BUG FIX BEGIN
+                // Bug 50973 - marking unread in group inbox removes message
+                if (empty($email->assigned_user_id))
+                {
+                    $email->setFieldNullable('assigned_user_id');
+                }
+                // BUG FIX END
+
 				switch($type) {
 					case "unread":
 						$email->status = 'unread';
@@ -1558,6 +1566,14 @@ eoq;
 					break;
 
 				}
+
+                // BUG FIX BEGIN
+                // Bug 50973 - reset assigned_user_id field defs
+                if (empty($email->assigned_user_id))
+                {
+                    $email->revertFieldNullable('assigned_user_id');
+                }
+                // BUG FIX END
 			}
 		} else {
 			/* dealing with IMAP email, uids are IMAP uids */
@@ -2320,7 +2336,7 @@ eoq;
 				$archived->dynamic_query = '';
 				$archived->save();
 
-				// set flag to show that this was run
+			// set flag to show that this was run
 			$user->setPreference("email2Preflight", true, 1, "Emails");
 		}
 	}
@@ -2743,7 +2759,10 @@ eoq;
 	function getCacheValue($ieId, $type, $file, $key) {
 		global $sugar_config;
 
-		$cacheFilePath = sugar_cached("modules/Emails/{$ieId}/{$type}/{$file}");
+		$cleanIeId = cleanDirName($ieId);
+		$cleanType = cleanDirName($type);
+		$cleanFile = cleanFileName($file);
+		$cacheFilePath = sugar_cached("modules/Emails/{$cleanIeId}/{$cleanType}/{$cleanFile}");
 		$cacheFile = array();
 
 		if(file_exists($cacheFilePath)) {
@@ -2822,7 +2841,10 @@ eoq;
 	function writeCacheFile($key, $var, $ieId, $type, $file) {
 		global $sugar_config;
 
-		$the_file = sugar_cached("/modules/Emails/{$ieId}/{$type}/{$file}");
+		$cleanIeId = cleanDirName($ieId);
+		$cleanType = cleanDirName($type);
+		$cleanFile = cleanFileName($file);
+		$the_file = sugar_cached("modules/Emails/{$cleanIeId}/{$cleanType}/{$cleanFile}");
 		$timestamp = strtotime('now');
 		$array = array();
 		$array['timestamp'] = $timestamp;
@@ -2964,4 +2986,4 @@ eoq;
         }
         return $str;
     }
-} // end class def
\ No newline at end of file
+} // end class def
diff --git a/modules/Emails/EmailUIAjax.php b/modules/Emails/EmailUIAjax.php
index 7328e38f..b85729a8 100644
--- a/modules/Emails/EmailUIAjax.php
+++ b/modules/Emails/EmailUIAjax.php
@@ -155,6 +155,8 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
         $GLOBALS['log']->debug("********** EMAIL 2.0 - Asynchronous - at: removeUploadedAttachment");
         $fileFromRequest = from_html($_REQUEST['file']);
         $fileGUID = substr($fileFromRequest, 0, 36);
+        // Bug52727: sanitize fileGUID to remove path components: /\.
+        $fileGUID = cleanDirName($fileGUID);
         $fileName = $email->et->userCacheDir . "/" . $fileGUID;
         $filePath = clean_path($fileName);
         unlink($filePath);
@@ -444,7 +446,21 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
     	        $email->parent_id = $modId;
                 $email->parent_type = $_REQUEST['parent_type'];
                 $email->status = 'read';
+
+                // BUG FIX BEGIN
+                // Bug 50979 - relating a message in group inbox removes message
+                if (empty($email->assigned_user_id))
+                {
+                    $email->setFieldNullable('assigned_user_id');
+                }
                 $email->save();
+                // Bug 50979 - reset assigned_user_id field defs
+                if (empty($email->assigned_user_id))
+                {
+                    $email->revertFieldNullable('assigned_user_id');
+                }
+                // BUG FIX END
+
                 $email->load_relationship($mod);
                 $email->$mod->add($modId);
     	    }
@@ -475,8 +491,9 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
         $GLOBALS['log']->debug("********** EMAIL 2.0 - Asynchronous - at: markEmail");
         if(isset($_REQUEST['uids']) && !empty($_REQUEST['uids']) &&
         isset($_REQUEST['type']) && !empty($_REQUEST['type']) &&
-        isset($_REQUEST['ieId']) && !empty($_REQUEST['ieId']) &&
-        isset($_REQUEST['folder']) && !empty($_REQUEST['folder'])) {
+        isset($_REQUEST['folder']) && !empty($_REQUEST['folder']) &&
+		isset($_REQUEST['ieId']) && (!empty($_REQUEST['ieId']) || (empty($_REQUEST['ieId']) && strpos($_REQUEST['folder'], 'sugar::') !== false))
+        ) {
         	$uid = $json->decode(from_html($_REQUEST['uids']));
         	$uids = array();
         	if(is_array($uid)) {
@@ -1556,8 +1573,8 @@ eoq;
         if(isset($_REQUEST['person']) && !empty($_REQUEST['person'])) {
             $person = $_REQUEST['person'];
         }
-        if(isset($_REQUEST['start']) && !empty($_REQUEST['start'])) {
-            $start = $_REQUEST['start'];
+        if(!empty($_REQUEST['start'])) {
+            $start = intval($_REQUEST['start']);
         } else {
         	$start = 0;
         }
@@ -1576,11 +1593,11 @@ eoq;
 	        $time = microtime(true);
 
 	        //Handle sort and order requests
-	        $sort = !empty($_REQUEST['sort']) ? $_REQUEST['sort'] : "id";
+	        $sort = !empty($_REQUEST['sort']) ? $ie->db->getValidDBName($_REQUEST['sort']) : "id";
 	        $sort = ($sort == 'bean_id') ? 'id' : $sort;
 	        $sort = ($sort == 'email') ? 'email_address' : $sort;
 	        $sort = ($sort == 'name') ? 'last_name' : $sort;
-	        $direction = !empty($_REQUEST['dir']) ? $_REQUEST['dir'] : "asc";
+	        $direction = !empty($_REQUEST['dir']) && in_array(strtolower($_REQUEST['dir']), array("asc", "desc")) ? $_REQUEST['dir'] : "asc";
 	        $order = ( !empty($sort) && !empty($direction) ) ? " ORDER BY {$sort} {$direction}" : "";
 
 	        $r = $ie->db->limitQuery($qArray['query'] . " $order ", $start, 25, true);
diff --git a/modules/Emails/javascript/EmailUI.js b/modules/Emails/javascript/EmailUI.js
index 50c6ece0..c8a43993 100644
--- a/modules/Emails/javascript/EmailUI.js
+++ b/modules/Emails/javascript/EmailUI.js
@@ -483,18 +483,20 @@ SE.accounts = {
             document.getElementById("mail_smtpuser_label").innerHTML = mod_strings.LBL_YAHOOMAIL_SMTPUSER;
             break;
         case "gmail":
-            document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
-            document.getElementById("mail_smtpport").value = '587';
-            document.getElementById("mail_smtpauth_req").checked = true;
-            var ssl = document.getElementById("mail_smtpssl");
-            for(var j=0;j<ssl.options.length;j++) {
-                if(ssl.options[j].text == 'TLS') {
-                    ssl.options[j].selected = true;
-                    break;
+            if(document.getElementById("mail_smtpserver").value == "" || document.getElementById("mail_smtpserver").value == 'plus.smtp.mail.yahoo.com') {
+                document.getElementById("mail_smtpserver").value = 'smtp.gmail.com';
+                document.getElementById("mail_smtpport").value = '587';
+                document.getElementById("mail_smtpauth_req").checked = true;
+                var ssl = document.getElementById("mail_smtpssl");
+                for(var j=0;j<ssl.options.length;j++) {
+                    if(ssl.options[j].text == 'TLS') {
+                        ssl.options[j].selected = true;
+                        break;
+                    }
                 }
             }
-            document.getElementById("mailsettings1").style.display = 'none';
-            document.getElementById("mailsettings2").style.display = 'none';
+            //document.getElementById("mailsettings1").style.display = 'none';
+            //document.getElementById("mailsettings2").style.display = 'none';
             document.getElementById("mail_smtppass_label").innerHTML = mod_strings.LBL_GMAIL_SMTPPASS;
             document.getElementById("mail_smtpuser_label").innerHTML = mod_strings.LBL_GMAIL_SMTPUSER;
             break;
@@ -2391,13 +2393,13 @@ SE.folders = {
 
         if(node != null && node.data) {
             SUGAR.showMessageBox(app_strings.LBL_EMAIL_FOLDERS_ADD_DIALOG_TITLE,
-                    app_strings.LBL_EMAIL_SETTINGS_NAME,
+                    app_strings.LBL_EMAIL_FOLDERS_NEW_FOLDER,
                     'prompt', {fn:SE.folders.folderAddXmlCall, beforeShow: SE.folders.folderAddRegisterEnter, beforeHide: SE.folders.folderRemoveRegisterEnter});
         } else {
             alert(app_strings.LBL_EMAIL_FOLDERS_NO_VALID_NODE);
         }
     },
-
+    
     folderAddRegisterEnter : function() {
     	this.enterKeyListener = new YAHOO.util.KeyListener(YAHOO.util.Dom.get("sugar-message-prompt"),
     															{keys: YAHOO.util.KeyListener.KEY.ENTER},
diff --git a/modules/Emails/javascript/EmailUICompose.js b/modules/Emails/javascript/EmailUICompose.js
index a204ae7e..1647a86a 100644
--- a/modules/Emails/javascript/EmailUICompose.js
+++ b/modules/Emails/javascript/EmailUICompose.js
@@ -767,6 +767,7 @@ SE.composeLayout = {
     bccHidden : true,
     outboundAccountErrors : null,
     loadedTinyInstances : {}, //Tracks which tinyMCE editors have initalized with html content.
+    subjectMaxlen : 255,
 
     showAddressDetails : function(e) {
     	var linkElement = document.getElementById("More"+e.id);
@@ -1638,6 +1639,7 @@ SE.composeLayout = {
      * @param int Instance index
      */
     saveDraft : function(tinyInstance) {
+        SE.tinyInstances.currentHtmleditor = 'htmleditor' + tinyInstance;
         this.sendEmail(tinyInstance, true);
     },
 
@@ -1808,7 +1810,7 @@ SE.composeLayout = {
         var composeOptionsFormName = "composeOptionsForm" + idx;
 
 
-        var t = SE.util.getTiny(SE.tinyInstances.currentHtmleditor);
+        var t = SE.util.getTiny('htmleditor' + idx);
         if (t != null || typeof(t) != "undefined") {
             var html = t.getContent();
         } else {
diff --git a/modules/Emails/javascript/complexLayout.js b/modules/Emails/javascript/complexLayout.js
index 4eca230f..d42d6f50 100644
--- a/modules/Emails/javascript/complexLayout.js
+++ b/modules/Emails/javascript/complexLayout.js
@@ -151,7 +151,11 @@ function complexLayoutInit() {
 			var listV =  this.getInnerLayout2Rows();
 			listV.set("height", tp.get("element").clientHeight - 25);
 			listV.render();
-            
+            tp.on("activeTabChange", function ()
+            {
+             	se.complexLayout.resize();
+            });
+
             se.leftTabs = new YAHOO.widget.TabView("lefttabs");
             var folderTab = new YAHOO.widget.Tab({ 
 				label: app_strings.LBL_EMAIL_FOLDERS_SHORT,
diff --git a/modules/Emails/javascript/composeEmailTemplate.js b/modules/Emails/javascript/composeEmailTemplate.js
index 5a5114fd..96cc28ec 100644
--- a/modules/Emails/javascript/composeEmailTemplate.js
+++ b/modules/Emails/javascript/composeEmailTemplate.js
@@ -135,7 +135,7 @@ SUGAR.email2.templates['compose'] = '<div id="composeLayout{idx}" class="ylayout
 '							</td>' +
 '							<td class="emailUIField" NOWRAP width="99%">' +
 '								<div class="ac_autocomplete">' +
-'									&nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="">' +
+'									&nbsp;&nbsp;<input class="ac_input" type="text" size="96" id="emailSubject{idx}" name="subject{idx}" value="" maxlength="'+SUGAR.email2.composeLayout.subjectMaxlen+'">' +
 '								</div>' +
 '							</td>' +
 '						</tr>' +
diff --git a/modules/Employees/Employee.php b/modules/Employees/Employee.php
index ce96c8ba..964c4562 100644
--- a/modules/Employees/Employee.php
+++ b/modules/Employees/Employee.php
@@ -257,6 +257,30 @@ class Employee extends Person {
         //return parent method, specifying for array to be returned
         return parent::create_new_list_query($order_by, $where, $filter,$params, $show_deleted, $join_type, $return_array, $parentbean, $singleSelect);
     }
+
+    /*
+     * Overwrite Sugar bean which returns the current objects custom fields.  Lets return User custom fields instead
+     */
+    function hasCustomFields()
+    {
+
+        //Check to see if there are custom user fields that we should report on, first check the custom_fields array
+        $userCustomfields = !empty($GLOBALS['dictionary']['Employee']['custom_fields']);
+        if(!$userCustomfields){
+            //custom Fields not set, so traverse employee fields to see if any custom fields exist
+            foreach ($GLOBALS['dictionary']['Employee']['fields'] as $k=>$v){
+                if(!empty($v['source']) && $v['source'] == 'custom_fields'){
+                    //custom field has been found, set flag to true and break
+                    $userCustomfields = true;
+                    break;
+                }
+
+            }
+        }
+
+        //return result of search for custom fields
+        return $userCustomfields;
+    }
 }
 
 ?>
diff --git a/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php b/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php
index 935039c2..8df65c71 100644
--- a/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php
+++ b/modules/Home/Dashlets/ChartsDashlet/ChartsDashlet.php
@@ -71,15 +71,15 @@ class ChartsDashlet extends Dashlet {
      */
     function display() {
     	require_once("modules/Reports/Report.php");
-			
-	
+		
 //		ini_set('display_errors', 'false');
 		
 		$chartReport = new SavedReport();
 		$chartExists = $chartReport->retrieve($this->report_id, false);
-		
+
 		if (!is_null($chartExists)){
-	        $this->title = $chartReport->name;
+			$title = getReportNameTranslation($chartReport->name);
+	        $this->title = $title; 
 				
 			$reporter = new Report($chartReport->content);
 			$reporter->is_saved_report = true;
diff --git a/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php b/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php
index e3089c29..062d3f87 100644
--- a/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php
+++ b/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.meta.php
@@ -39,7 +39,8 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 global $app_strings;
 
 $dashletMeta['iFrameDashlet'] = array('module'		=> 'Home',
-                                      'title'       => translate('LBL_DASHLET_TITLE', 'Home'),
+                                      'titleLabel'	=> 'LBL_DASHLET_TITLE',
+                                      'title'		=> 'LBL_DASHLET_TITLE',
                                       'description' => 'A customizeable portal page',
                                       'icon'        => 'themes/default/images/icon_iFrames_32.gif',
-                                      'category'    => 'Web');
\ No newline at end of file
+                                      'category'    => 'Web');
diff --git a/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php b/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php
index 6bfc2a54..b22c49d6 100644
--- a/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php
+++ b/modules/Home/Dashlets/iFrameDashlet/iFrameDashlet.php
@@ -50,11 +50,15 @@ class iFrameDashlet extends Dashlet {
         parent::Dashlet($id);
         $this->isConfigurable = true;
 
-        if(empty($options['title'])) {
-            $this->title = translate('LBL_DASHLET_TITLE', 'Home');
-            $this->title = translate('LBL_DASHLET_DISCOVER_SUGAR_PRO', 'Home');
+        if(!empty($options['titleLabel'])) {
+        	$this->title = translate($options['titleLabel'], 'Home');
         } else {
-            $this->title = $options['title'];
+	        if(empty($options['title'])) {
+	            $this->title = translate('LBL_DASHLET_TITLE', 'Home');
+	            $this->title = translate('LBL_DASHLET_DISCOVER_SUGAR_PRO', 'Home');
+	        } else {
+	            $this->title = $options['title'];
+	        }
         }
         if(empty($options['url'])) {
             $this->url = $this->defaultURL;
diff --git a/modules/Home/UnifiedSearchAdvanced.php b/modules/Home/UnifiedSearchAdvanced.php
index af9a8796..2d8feb4b 100644
--- a/modules/Home/UnifiedSearchAdvanced.php
+++ b/modules/Home/UnifiedSearchAdvanced.php
@@ -182,9 +182,12 @@ class UnifiedSearchAdvanced {
 			$modules_to_search = array();
 			if(!empty($_REQUEST['search_modules']))
 			{
-			    foreach(explode (',', $_REQUEST['search_modules'] ) as $e)
+			    foreach(explode (',', $_REQUEST['search_modules'] ) as $key)
 	            {
-	                $modules_to_search[$e] = $beanList[$e];
+                    if (isset($unified_search_modules_display[$key]) && !empty($unified_search_modules_display[$key]['visible']))
+                    {
+                        $modules_to_search[$key] = $beanList[$key];
+                    }
 	            }
 			}
 
@@ -671,5 +674,3 @@ function unified_search_modules_cmp($a, $b) {
 
 	return $name1 < $name2 ? -1 : 1;
 }
-
-?>
\ No newline at end of file
diff --git a/modules/Home/index.php b/modules/Home/index.php
index 67f9bce9..5bb67947 100644
--- a/modules/Home/index.php
+++ b/modules/Home/index.php
@@ -101,7 +101,7 @@ if(!$hasUserPreferences){
                                          'module' => 'Home',
                                          'forceColumn' => 0,
                                          'fileLocation' => $dashletsFiles['iFrameDashlet']['file'],
-                                         'options' => array('title' => translate('LBL_DASHLET_DISCOVER_SUGAR_PRO','Home'),
+                                         'options' => array('titleLabel' => 'LBL_DASHLET_DISCOVER_SUGAR_PRO',
                                                             'url' => 'http://www.sugarcrm.com/crm/product/gopro',
                                                             'height' => 315,
                                              ));
@@ -116,7 +116,7 @@ if(!$hasUserPreferences){
                                          'module' => 'Home',
                                          'forceColumn' => 1,
                                          'fileLocation' => $dashletsFiles['iFrameDashlet']['file'],
-                                         'options' => array('title' => translate('LBL_DASHLET_SUGAR_NEWS','Home'),
+                                         'options' => array('titleLabel' => 'LBL_DASHLET_SUGAR_NEWS',
                                                             'url' => 'http://www.sugarcrm.com/crm/product/news',
                                                             'height' => 315,
                                              ));
@@ -187,7 +187,7 @@ if (empty($pages)){
 	$pageIndex = 0;
 	$pages[0]['columns'] = $columns;
 	$pages[0]['numColumns'] = '2';
-	$pages[0]['pageTitle'] = $mod_strings['LBL_HOME_PAGE_1_NAME'];	// "My Sugar"
+	$pages[0]['pageTitleLabel'] = 'LBL_HOME_PAGE_1_NAME';	// "My Sugar"
 	$pageIndex++;
 	$current_user->setPreference('pages', $pages, 0, 'Home');
     $activePage = 0;
@@ -301,7 +301,13 @@ $resources = $sugarChart->getChartResources();
 $mySugarResources = $sugarChart->getMySugarChartResources();
 $sugar_smarty->assign('chartResources', $resources);
 $sugar_smarty->assign('mySugarChartResources', $mySugarResources);
-echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar.tpl');
+
+if (file_exists("custom/include/MySugar/tpls/MySugar.tpl")) {
+	echo $sugar_smarty->fetch('custom/include/MySugar/tpls/MySugar.tpl');
+} else {
+	echo $sugar_smarty->fetch('include/MySugar/tpls/MySugar.tpl');
+}
+
 //init the quickEdit listeners after the dashlets have loaded on home page the first time
 echo"<script>if(typeof(qe_init) != 'undefined'){qe_init();}</script>";
-?>
\ No newline at end of file
+?>
diff --git a/modules/Home/views/view.list.php b/modules/Home/views/view.list.php
index 5b29266b..6476c256 100644
--- a/modules/Home/views/view.list.php
+++ b/modules/Home/views/view.list.php
@@ -47,6 +47,24 @@ class HomeViewList extends ViewList{
  		global $mod_strings, $export_module, $current_language, $theme, $current_user, $dashletData, $sugar_flavor;
         if($this->checkPostMaxSizeError()){
             $this->errors[] = $GLOBALS['app_strings']['UPLOAD_ERROR_HOME_TEXT'];
+            $contentLength = $_SERVER['CONTENT_LENGTH'];
+
+            $maxPostSize = ini_get('post_max_size');
+            if (stripos($maxPostSize,"k"))
+                $maxPostSize = (int) $maxPostSize * pow(2, 10);
+            elseif (stripos($maxPostSize,"m"))
+                $maxPostSize = (int) $maxPostSize * pow(2, 20);
+
+            $maxUploadSize = ini_get('upload_max_filesize');
+            if (stripos($maxUploadSize,"k"))
+                $maxUploadSize = (int) $maxUploadSize * pow(2, 10);
+            elseif (stripos($maxUploadSize,"m"))
+                $maxUploadSize = (int) $maxUploadSize * pow(2, 20);
+
+            $max_size = min($maxPostSize, $maxUploadSize);
+
+            $errMessage = string_format($GLOBALS['app_strings']['UPLOAD_MAXIMUM_EXCEEDED'],array($contentLength,  $max_size));
+            $this->errors[] = '* '.$errMessage;
             $this->displayErrors();
         }
  		include('modules/Home/index.php');
diff --git a/modules/Import/ImportCacheFiles.php b/modules/Import/ImportCacheFiles.php
index 2c1637d6..a3107744 100644
--- a/modules/Import/ImportCacheFiles.php
+++ b/modules/Import/ImportCacheFiles.php
@@ -91,7 +91,7 @@ class ImportCacheFiles
      */
     public static function convertFileNameToUrl($fileName)
     {
-                $fileName = str_replace(self::getImportDir() . "/", "", $fileName);
+        $fileName = str_replace(self::getImportDir() . "/", "", $fileName);
         $fileName = "index.php?entryPoint=download&id=ImportErrors&type=import&tempName=" . $fileName . "&isTempFile=1";
         return $fileName;
     }
diff --git a/modules/Import/Importer.php b/modules/Import/Importer.php
index 3c569af9..0d859efa 100644
--- a/modules/Import/Importer.php
+++ b/modules/Import/Importer.php
@@ -509,9 +509,14 @@ class Importer
         */
         if ( ( !empty($focus->new_with_id) && !empty($focus->date_modified) ) ||
              ( empty($focus->new_with_id) && $timedate->to_db($focus->date_modified) != $timedate->to_db($timedate->to_display_date_time($focus->fetched_row['date_modified'])) )
-        )
+        ) 
             $focus->update_date_modified = false;
 
+        // Bug 53636 - Allow update of "Date Created"
+        if (!empty($focus->date_entered)) {
+        	$focus->update_date_entered = true;
+        }
+            
         $focus->optimistic_lock = false;
         if ( $focus->object_name == "Contact" && isset($focus->sync_contact) )
         {
@@ -539,8 +544,21 @@ class Importer
         // call any logic needed for the module preSave
         $focus->beforeImportSave();
 
+        // Bug51192: check if there are any changes in the imported data
+        $hasDataChanges = false;
+        $dataChanges=$focus->db->getDataChanges($focus);
+        
+        if(!empty($dataChanges)) {
+            foreach($dataChanges as $field=>$fieldData) {
+                if($fieldData['data_type'] != 'date' || strtotime($fieldData['before']) != strtotime($fieldData['after'])) {
+                    $hasDataChanges = true;
+                    break;
+                }
+            }
+        }
+        
         // if modified_user_id is set, set the flag to false so SugarBEan will not reset it
-        if (isset($focus->modified_user_id) && $focus->modified_user_id) {
+        if (isset($focus->modified_user_id) && $focus->modified_user_id && !$hasDataChanges) {
             $focus->update_modified_by = false;
         }
         // if created_by is set, set the flag to false so SugarBEan will not reset it
diff --git a/modules/Import/views/view.confirm.php b/modules/Import/views/view.confirm.php
index 562909bb..9f82d024 100644
--- a/modules/Import/views/view.confirm.php
+++ b/modules/Import/views/view.confirm.php
@@ -453,7 +453,15 @@ eoq;
                 }
             }
         }
-
+        
+        foreach ($rows as &$row) {
+            if (is_array($row)) {
+                foreach ($row as &$val) {
+                    $val = strip_tags($val);
+                }
+            }
+        }
+    
         return $rows;
     }
 
diff --git a/modules/Import/views/view.last.php b/modules/Import/views/view.last.php
index 4d373116..f270fd69 100644
--- a/modules/Import/views/view.last.php
+++ b/modules/Import/views/view.last.php
@@ -103,11 +103,12 @@ class ImportViewLast extends ImportView
             $activeTab = 0;
 
         $this->ss->assign("JAVASCRIPT", $this->_getJS($activeTab));
-        $this->ss->assign("errorCount",$errorCount);
-        $this->ss->assign("dupeCount",$dupeCount);
-        $this->ss->assign("createdCount",$createdCount);
-        $this->ss->assign("updatedCount",$updatedCount);
-        $this->ss->assign("errorFile",ImportCacheFiles::convertFileNameToUrl(ImportCacheFiles::getErrorFileName()));
+
+        $this->ss->assign("errorCount", $errorCount);
+        $this->ss->assign("dupeCount", $dupeCount);
+        $this->ss->assign("createdCount", $createdCount);
+        $this->ss->assign("updatedCount", $updatedCount);
+        $this->ss->assign("errorFile", ImportCacheFiles::convertFileNameToUrl(ImportCacheFiles::getErrorFileName()));
         $this->ss->assign("errorrecordsFile", ImportCacheFiles::convertFileNameToUrl(ImportCacheFiles::getErrorRecordsWithoutErrorFileName()));
         $this->ss->assign("dupeFile", ImportCacheFiles::convertFileNameToUrl(ImportCacheFiles::getDuplicateFileName()));
 
diff --git a/modules/Import/views/view.step3.php b/modules/Import/views/view.step3.php
index 950cffbe..6c2a3bbd 100644
--- a/modules/Import/views/view.step3.php
+++ b/modules/Import/views/view.step3.php
@@ -157,7 +157,7 @@ class ImportViewStep3 extends ImportView
             $this->_showImportError($mod_strings['LBL_NO_LINES'],$_REQUEST['import_module'],'Step2');
             return;
         }
-
+        
         // save first row to send to step 4
         $this->ss->assign("FIRSTROW", base64_encode(serialize($rows[0])));
 
@@ -303,9 +303,9 @@ class ImportViewStep3 extends ImportView
             $columns[] = array(
                 'field_choices' => implode('',$options),
                 'default_field' => $defaultFieldHTML,
-                'cell1'         => str_replace("&quot;",'', htmlspecialchars($cellOneData)),
-                'cell2'         => str_replace("&quot;",'', htmlspecialchars($cellTwoData)),
-                'cell3'         => str_replace("&quot;",'', htmlspecialchars($cellThreeData)),
+                'cell1'         => strip_tags($cellOneData),
+                'cell2'         => strip_tags($cellTwoData),
+                'cell3'         => strip_tags($cellThreeData),
                 'show_remove'   => false,
                 );
         }
diff --git a/modules/InboundEmail/EditView.php b/modules/InboundEmail/EditView.php
index 3dd2b819..967ed382 100644
--- a/modules/InboundEmail/EditView.php
+++ b/modules/InboundEmail/EditView.php
@@ -196,7 +196,9 @@ $javascript->setFormName('EditView');
 
 //If we are creating a duplicate, remove the email_password from being required since this
 //can be derived from the InboundEmail we are duplicating from
-if($isDuplicate && isset($focus->required_fields['email_password']))
+// Bug 47863 - email_password shouldn't be required on a modified Inbound Email account
+// either.
+if(($isDuplicate || !$validatePass) && isset($focus->required_fields['email_password']))
 {
    unset($focus->required_fields['email_password']);
 }
diff --git a/modules/InboundEmail/InboundEmail.php b/modules/InboundEmail/InboundEmail.php
index 6ae7ae23..e1547e64 100644
--- a/modules/InboundEmail/InboundEmail.php
+++ b/modules/InboundEmail/InboundEmail.php
@@ -389,6 +389,7 @@ class InboundEmail extends SugarBean {
 
 				if(!empty($line)) {
 					$key = trim(substr($line, 0, strpos($line, ":")));
+					$key = strip_tags($key);
 					$value = trim(substr($line, strpos($line, ":") + 1));
 					$value = to_html($value);
 
@@ -872,7 +873,7 @@ class InboundEmail extends SugarBean {
 						case "mailsize":
 						case "senddate":
 						case "mbox":
-                        case "ie_id":
+						case "ie_id":
 						break;
 
 						default:
@@ -3427,12 +3428,12 @@ class InboundEmail extends SugarBean {
 				// we will take either 'attachments' or 'inline'
 				if(strtolower($part->disposition) == 'attachment' || ((strtolower($part->disposition) == 'inline') && $part->type != 0)) {
 					$attach = $this->getNoteBeanForAttachment($emailId);
-					$fname = $this->handleEncodedFilename($this->retrieveAttachmentNameFromStructure($part->dparameters));
+					$fname = $this->handleEncodedFilename($this->retrieveAttachmentNameFromStructure($part));
 
 					if(!empty($fname)) {//assign name to attachment
 						$attach->name = $fname;
 					} else {//if name is empty, default to filename
-						$attach->name = urlencode($this->retrieveAttachmentNameFromStructure($part->dparameters));
+						$attach->name = urlencode($this->retrieveAttachmentNameFromStructure($part));
 					}
 					$attach->filename = $attach->name;
 					if (empty($attach->filename)) {
@@ -3512,17 +3513,16 @@ class InboundEmail extends SugarBean {
 	}
 
 	/**
-	 * Return the filename of the attachment by examining the dparameters returned from imap_fetch_structure which
-	 * represet the content-disposition of the MIME header.
-	 *
-	 * @param array $dparamaters
+	 * Return the filename of the attachment by examining the dparameters or parameters returned from imap_fetch_structure
+     *
+	 * @param object $part
 	 * @return string
 	 */
-	function retrieveAttachmentNameFromStructure($dparamaters)
+	function retrieveAttachmentNameFromStructure($part)
 	{
 	   $result = "";
 
-	   foreach ($dparamaters as $k => $v)
+	   foreach ($part->dparamaters as $k => $v)
 	   {
 	       if( strtolower($v->attribute) == 'filename')
 	       {
@@ -3531,6 +3531,15 @@ class InboundEmail extends SugarBean {
 	       }
 	   }
 
+		if (empty($result)) {
+			foreach ($part->parameters as $k => $v) {
+				if (strtolower($v->attribute) == 'name') {
+					$result = $v->value;
+					break;
+				}
+			}
+		}
+		
 	   return $result;
 
     }
@@ -3981,10 +3990,13 @@ class InboundEmail extends SugarBean {
 			// handle UTF-8/charset encoding in the ***headers***
 			global $db;
 			$email->name			= $this->handleMimeHeaderDecode($header->subject);
-			$email->date_start = (!empty($unixHeaderDate)) ? $timedate->asUserDate($unixHeaderDate) : "";
-			$email->time_start = (!empty($unixHeaderDate)) ? $timedate->asUserTime($unixHeaderDate) : "";
 			$email->type = 'inbound';
-			$email->date_created = (!empty($unixHeaderDate)) ? $timedate->asUser($unixHeaderDate) : "";
+			if(!empty($unixHeaderDate)) {
+			    $email->date_sent = $timedate->asUser($unixHeaderDate);
+			    list($email->date_start, $email->time_start) = $timedate->split_date_time($email->date_sent);
+			} else {
+			    $email->date_start = $email->time_start = $email->date_sent = "";
+			}
 			$email->status = 'unread'; // this is used in Contacts' Emails SubPanel
 			if(!empty($header->toaddress)) {
 				$email->to_name	 = $this->handleMimeHeaderDecode($header->toaddress);
@@ -5052,8 +5064,15 @@ eoq;
 
 					// when you move from My Emails to Group Folder, Assign To field for the Email should become null
 					if ($fromSugarFolder->is_dynamic && $toSugarFolder->is_group) {
+                        // Bug 50972 - assigned_user_id set to empty string not true null
+                        // Modifying the field defs in just this one place to allow
+                        // a true null since this is what is expected when reading
+                        // inbox folders
+                        $email->setFieldNullable('assigned_user_id');
 						$email->assigned_user_id = "";
 						$email->save();
+                        $email->revertFieldNullable('assigned_user_id');
+                        // End fix 50972
 						if (!$toSugarFolder->checkEmailExistForFolder($id)) {
 							$fromSugarFolder->deleteEmailFromAllFolder($id);
 							$toSugarFolder->addBean($email);
diff --git a/modules/Leads/tpls/ConvertLead.tpl b/modules/Leads/tpls/ConvertLead.tpl
index 11ffc4ac..485d4425 100644
--- a/modules/Leads/tpls/ConvertLead.tpl
+++ b/modules/Leads/tpls/ConvertLead.tpl
@@ -54,6 +54,11 @@
 {{$field}}   
 {{/foreach}}
 {{/if}}
+{if $def.required }
+<script type="text/javascript">
+mod_array.push('{{$module}}');//Bug#50590 add all required modules to mod_array
+</script>
+{/if}
 {if !$def.required || !empty($def.select)}
 <input class="checkbox" type="checkbox" name="new{{$module}}" id="new{{$module}}" onclick="toggleDisplay('create{{$module}}');if (typeof(addRemoveDropdownElement) == 'function') addRemoveDropdownElement('{{$module}}');{{if !empty($def.select)}}toggle{{$module}}Select();{{/if}}">
 <script type="text/javascript">
@@ -91,7 +96,7 @@
         <span class="required">{{$APP.LBL_REQUIRED_SYMBOL}}</span>
     {/if}
 </td><td id ="select{{$module}}">
-{{sugar_field parentFieldArray='contact_def' vardef=$contact_def[$def.select] displayType='EditView' formName=$form_name call_back_function='set_return_lead_conv'}}
+{{sugar_field parentFieldArray='contact_def' vardef=$contact_def[$def.select] displayType='EditView' displayParams=$displayParams formName=$form_name call_back_function='set_return_lead_conv'}}
 <script>
 if (typeof(sqs_objects) == "undefined") sqs_objects = [];
 sqs_objects['{{$form_name}}_{{$def.select}}'] = {ldelim}
@@ -170,4 +175,4 @@ sqs_objects['{{$form_name}}_{{$def.select}}'] = {ldelim}
     </tr>
 {{/foreach}}
 </table>
-{{/foreach}}
\ No newline at end of file
+{{/foreach}}
diff --git a/modules/Leads/tpls/ConvertLeadFooter.tpl b/modules/Leads/tpls/ConvertLeadFooter.tpl
index 1142ff31..d6d6277f 100644
--- a/modules/Leads/tpls/ConvertLeadFooter.tpl
+++ b/modules/Leads/tpls/ConvertLeadFooter.tpl
@@ -133,4 +133,7 @@
 {/if}
 </td>
 </tr>
-</table>
\ No newline at end of file
+</table>
+ <script type="text/javascript">
+   addDropdownElements();//Bug#50590 after  lead_conv_ac_op_sel is loaded fill it with all required modules
+ </script>
diff --git a/modules/Leads/tpls/ConvertLeadHeader.tpl b/modules/Leads/tpls/ConvertLeadHeader.tpl
index 97ac9bc7..0e793725 100644
--- a/modules/Leads/tpls/ConvertLeadHeader.tpl
+++ b/modules/Leads/tpls/ConvertLeadHeader.tpl
@@ -37,6 +37,33 @@
 *}
 {literal}
 <script type="text/javascript">
+
+/**
+  *  Start Bug#50590 
+  *  mod_array global array that contains required modules
+  *  addDropdownElements fills lead_conv_ac_op_sel with all required modules except Contacts 
+  *  as this module is in the list by default
+  */
+
+ var mod_array = new Array; 
+ function addDropdownElements(){
+   var i;
+   for(i=0; i<=mod_array.length-1; i++){
+     if(mod_array[i] != 'Contacts'){
+       var dropdown = document.getElementById('lead_conv_ac_op_sel');
+       var opt = document.createElement("option");
+       opt.text = SUGAR.language.get('app_list_strings', "moduleListSingular")[mod_array[i]];
+       opt.value = mod_array[i];
+       opt.label = opt.text;
+       dropdown.options.add(opt);
+     }
+   }
+ }
+ /**
+  *   End Bug#50590
+  */    
+
+
 function addRemoveDropdownElement(module) {
     var accountText = document.getElementById('account_name');
     var checkbox = document.getElementById('new'+module);
@@ -83,8 +110,8 @@ function addRemoveDropdownElement(module) {
 <input type="hidden" name="return_id" value="{$smarty.request.return_id}">
 <input type="hidden" name="module_tab"> 
 <input type="hidden" name="contact_role">
-{if !empty($smarty.request.return_module)}
-<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{else}{$smarty.request.return_module}{/if}">
+{if !empty($smarty.request.return_module) || !empty($smarty.request.relate_to)}
+<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif $smarty.request.relate_to && empty($smarty.request.from_dcmenu)}{$smarty.request.relate_to}{elseif empty($isDCForm) && empty($smarty.request.from_dcmenu)}{$smarty.request.return_module}{/if}">
 <input type="hidden" name="relate_id" value="{$smarty.request.return_id}">
 {/if}
 <input type="hidden" name="offset" value="{$offset}">
@@ -109,4 +136,4 @@ function addRemoveDropdownElement(module) {
 {/if}
 </td>
 </tr>
-</table>
\ No newline at end of file
+</table>
diff --git a/modules/Leads/tpls/QuickCreate.tpl b/modules/Leads/tpls/QuickCreate.tpl
index cb97f724..7b562284 100644
--- a/modules/Leads/tpls/QuickCreate.tpl
+++ b/modules/Leads/tpls/QuickCreate.tpl
@@ -51,8 +51,8 @@
 <input type="hidden" name="return_action" value="{$smarty.request.return_action}">
 <input type="hidden" name="return_id" value="{$smarty.request.return_id}">
 <input type="hidden" name="contact_role">
-{if !empty($smarty.request.return_module)}
-<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif empty($isDCForm)}{$smarty.request.return_module}{/if}">
+{if !empty($smarty.request.return_module) || !empty($smarty.request.relate_to)}
+<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif $smarty.request.relate_to && empty($smarty.request.from_dcmenu)}{$smarty.request.relate_to}{elseif empty($isDCForm) && empty($smarty.request.from_dcmenu)}{$smarty.request.return_module}{/if}">
 <input type="hidden" name="relate_id" value="{$smarty.request.return_id}">
 {/if}
 <input type="hidden" name="offset" value="{$offset}">
diff --git a/modules/Leads/vardefs.php b/modules/Leads/vardefs.php
index 0962b116..29edda68 100644
--- a/modules/Leads/vardefs.php
+++ b/modules/Leads/vardefs.php
@@ -288,6 +288,7 @@ $dictionary['Lead'] = array('table' => 'leads','audited'=>true, 'unified_search'
       'isnull' => 'true',
       'module' => 'Campaigns',
       'source' => 'non-db',
+      'additionalFields' => array('id' => 'campaign_id')
     ),
     'campaign_leads' =>
     array (
@@ -441,6 +442,7 @@ $dictionary['Lead'] = array('table' => 'leads','audited'=>true, 'unified_search'
     'type' => 'url',
     'dbType' => 'varchar',
     'len' => 255,
+    'link_target' => '_blank',
     'comment' => 'URL of website for the company',
   ),
 
diff --git a/modules/Leads/views/view.convertlead.php b/modules/Leads/views/view.convertlead.php
index 4efd2d61..a819f8d9 100644
--- a/modules/Leads/views/view.convertlead.php
+++ b/modules/Leads/views/view.convertlead.php
@@ -114,6 +114,13 @@ class ViewConvertLead extends SugarView
         $qsd->setFormName("ConvertLead");
 
         $this->contact = new Contact();
+        // Bug #50126 We have to fill account_name & add ability to select account from popup with pre populated name
+        if (!empty($this->focus->account_name))
+        {
+            $smarty->assign('displayParams', array(
+                'initial_filter' => '&name_advanced=' . urlencode($this->focus->account_name))
+            );
+        }
         $smarty->assign("contact_def", $this->contact->field_defs);
         $smarty->assign("form_name", "ConvertLead");
         $smarty->assign("form_id", "ConvertLead");
@@ -372,6 +379,8 @@ class ViewConvertLead extends SugarView
                 return;
             }
             $this->new_contact = true;
+        } elseif (isset($_POST['ContinueContact'])) {
+            $this->new_contact = true;
         }
         if (!empty($_REQUEST['selectedAccount']))
         {
@@ -566,6 +575,20 @@ class ViewConvertLead extends SugarView
 
     	$activities = $this->getActivitiesFromLead($lead);
 
+        //if account is being created, we will specify the account as the parent bean
+        $accountParentInfo = array();
+
+        //determine the account id info ahead of time if it is being created as part of this conversion
+        if(!empty($beans['Accounts'])){
+            $account_id = create_guid();
+            if(!empty($beans['Accounts']->id)){
+                $account_id = $beans['Accounts']->id;
+            }else{
+                $beans['Accounts']->id = $account_id;
+            }
+            $accountParentInfo = array('id'=>$account_id,'type'=>'Accounts');
+        }
+
     	foreach($beans as $module => $bean)
     	{
 	    	if (isset($parent_types[$module]))
@@ -585,7 +608,7 @@ class ViewConvertLead extends SugarView
 	                                    if (is_array($_POST['lead_conv_ac_op_sel'])) {
 	                                        foreach ($_POST['lead_conv_ac_op_sel'] as $mod) {
 	                                            if ($mod == $module) {
-	                                                $this->copyActivityAndRelateToBean($activity, $bean);
+	                                                $this->copyActivityAndRelateToBean($activity, $bean, $accountParentInfo);
 	                                                break;
 	                                            }
 	                                        }
@@ -684,7 +707,8 @@ class ViewConvertLead extends SugarView
 
 	protected function copyActivityAndRelateToBean(
 	    $activity,
-	    $bean
+	    $bean,
+        $parentArr = array()
 	    )
 	{
 		global $beanList;
@@ -693,10 +717,24 @@ class ViewConvertLead extends SugarView
 		$newActivity->id = create_guid();
 		$newActivity->new_with_id = true;
 
+        //set the parent id and type if it was passed in, otherwise use blank to wipe it out
+        $parentID = '';
+        $parentType = '';
+        if(!empty($parentArr)){
+            if(!empty($parentArr['id'])){
+                $parentID = $parentArr['id'];
+            }
+
+            if(!empty($parentArr['type'])){
+                $parentType = $parentArr['type'];
+            }
+
+        }
+
 		//Special case to prevent duplicated tasks from appearing under Contacts multiple times
     	if ($newActivity->module_dir == "Tasks" && $bean->module_dir != "Contacts")
     	{
-    		$newActivity->contact_id = $activity->contact_name = "";
+            $newActivity->contact_id = $newActivity->contact_name = "";
     	}
 
 		if ($rel = $this->findRelationship($newActivity, $bean))
@@ -714,9 +752,13 @@ class ViewConvertLead extends SugarView
                 $key = $relObj->rhs_key;
                 $newActivity->$key = $bean->id;
             }
-            $newActivity->parent_id = $bean->id;
-	        $newActivity->parent_type = $bean->module_dir;
-	        $newActivity->update_date_modified = false; //bug 41747 
+
+            //parent (related to field) should be blank unless it is explicitly sent in
+            //it is not sent in unless the account is being created as well during lead conversion
+            $newActivity->parent_id =  $parentID;
+            $newActivity->parent_type = $parentType;
+
+	        $newActivity->update_date_modified = false; //bug 41747
 	        $newActivity->save();
             $newActivity->$rel->add($bean);
             if ($newActivity->module_dir == "Notes" && $newActivity->filename) {
diff --git a/modules/MailMerge/Step3.php b/modules/MailMerge/Step3.php
index 4ca6b7e8..11841cd6 100644
--- a/modules/MailMerge/Step3.php
+++ b/modules/MailMerge/Step3.php
@@ -35,23 +35,10 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  * "Powered by SugarCRM".
  ********************************************************************************/
 
-/*
- * Created on Oct 4, 2005
- *
- * To change the template for this generated file go to
- * Window - Preferences - PHPeclipse - PHP - Code Templates
- */
-
-
-
-
-
 
 require_once ('include/JSON.php');
 require_once('modules/MailMerge/modules_array.php');
-
-
-
+require_once('modules/MailMerge/merge_query.php');
 
 global $app_strings;
 global $app_list_strings;
@@ -71,12 +58,12 @@ if(!isset($_SESSION['MAILMERGE_MODULE']))
 	if(isset($_POST['mailmerge_module']))
 	{
 		$_SESSION['MAILMERGE_MODULE'] = $_POST['mailmerge_module'];
-	}	
+	}
 }
 
 if(isset($_POST['contains_contact_info'])){
 
-	$_SESSION['MAILMERGE_CONTAINS_CONTACT_INFO'] = $_POST['contains_contact_info'];	
+	$_SESSION['MAILMERGE_CONTAINS_CONTACT_INFO'] = $_POST['contains_contact_info'];
 
 }
 
@@ -90,7 +77,7 @@ if(!isset($_SESSION["MAILMERGE_DOCUMENT_ID"]))
 $document_id = $_SESSION["MAILMERGE_DOCUMENT_ID"];
 $document = new Document();
 $document->retrieve($document_id);
-$_SESSION["MAILMERGE_TEMPLATE"] = $document->document_name;	
+$_SESSION["MAILMERGE_TEMPLATE"] = $document->document_name;
 
 if(!empty($_POST['selected_objects']))
 {
@@ -104,17 +91,8 @@ else
 $sel_obj = array();
 parse_str(html_entity_decode($selObjs, ENT_QUOTES),$sel_obj);
 $step_num = 3;
-if(isset($_SESSION['MAILMERGE_RECORD']))
-{
-	$xtpl->assign("PREV_STEP", '2');
-	$step_num = 3;
-	//$xtpl->assign("RECORD", $_SESSION['MAILMERGE_RECORD']);	
-}
-else
-{
-	$xtpl->assign("PREV_STEP", '2');
-}
-$xtpl->assign("STEP_NUM", "Step ".$step_num.":");
+$xtpl->assign("PREV_STEP", '2');
+$xtpl->assign("STEP_NUM", "Step 3:");
 $popup_request_data = array ('call_back_function' => 'set_return', 'form_name' => 'EditView', 'field_to_name_array' => array ('id' => 'rel_id', 'name' => 'rel_name',),);
 	$json = getJSONobj();
 
@@ -137,35 +115,8 @@ $xtpl->assign("STEP3_HEADER", "Set ".get_singular_bean_name($relModule)." Associ
 
 
 $select = "Select id, name from contacts";
-
-$selQuery = array ('Contacts'=>array('Accounts' => 'SELECT contacts.* FROM contacts LEFT JOIN accounts_contacts ON contacts.id=accounts_contacts.contact_id AND (accounts_contacts.deleted is NULL or accounts_contacts.deleted=0)',
-'Contacts' => '',
-'Opportunities' => 'SELECT contacts.* FROM contacts LEFT JOIN opportunities_contacts ON contacts.id=opportunities_contacts.contact_id AND (opportunities_contacts.deleted is NULL or opportunities_contacts.deleted=0)',
-'Leads' => '',
-'Cases' => 'SELECT contacts.* FROM contacts LEFT JOIN contacts_cases ON contacts.id=contacts_cases.contact_id AND (contacts_cases.deleted is NULL or contacts_cases.deleted=0)',
-'Bugs' => 'SELECT contacts.* FROM contacts LEFT JOIN contacts_bugs ON contacts.id=contacts_bugs.contact_id AND (contacts_bugs.deleted is NULL or contacts_bugs.deleted=0)',
-'Quotes' => 'SELECT contacts.* FROM contacts LEFT JOIN quotes_contacts ON contacts.id=quotes_contacts.contact_id AND (quotes_contacts.deleted is NULL or quotes_contacts.deleted=0)'),
-'Opportunities'=>array("Accounts"=>'SELECT opportunities.id, opportunities.name FROM opportunities LEFT JOIN accounts_opportunities ON opportunities.id = accounts_opportunities.opportunity_id AND (accounts_opportunities.deleted is NULL or accounts_opportunities.deleted=0)'),
-'Accounts'=>array("Opportunities"=>'SELECT accounts.id, accounts.name FROM accounts LEFT JOIN accounts_opportunities ON accounts.id = accounts_opportunities.account_id AND (accounts_opportunities.deleted is NULL or accounts_opportunities.deleted=0)'),
-);
-$whereQuery = array('Contacts' => array('Accounts' => 'accounts_contacts.contact_id = contacts.id AND accounts_contacts.account_id = ',
-'Contacts' => '',
-'Opportunities' => 'opportunities_contacts.contact_id = contacts.id AND opportunities_contacts.opportunity_id = ',
-'Leads' => '',
-'Cases' => 'contacts_cases.contact_id = contacts.id AND contacts_cases.case_id = ',
-'Bugs' => 'contacts_bugs.contact_id = contacts.id AND contacts_bugs.bug_id = ',
-'Quotes' => 'quotes_contacts.contact_id = contacts.id AND quotes_contacts.quote_id = '),
-'Opportunities'=>array('Accounts'=>'accounts_opportunities.opportunity_id = opportunities.id AND accounts_opportunities.account_id = '),
-'Accounts'=>array('Opportunities'=>'accounts_opportunities.account_id = accounts.id  AND accounts_opportunities.opportunity_id = '),
-);
-
-
-
-$contact = new Contact();
-
-
 global $beanList, $beanFiles;
-$class_name = $beanList[$relModule ];
+$class_name = $beanList[$relModule];
 require_once($beanFiles[$class_name]);
 $seed = new $class_name();
 
@@ -184,42 +135,28 @@ foreach($sel_obj as $key => $value)
 {
 	$value = str_replace("##", "&", $value);
 	$value = stripslashes($value);
-	$code = str_replace('-', '', $key);
+	$code = md5($key);
 	$popup_request_data = array ('call_back_function' => 'set_return', 'form_name' => 'EditView', 'field_to_name_array' => array ('id' => 'rel_id_'.$code, 'name' => 'rel_name_'.$code,),);
 	$encoded_popup_request_data = urlencode($json->encode($popup_request_data));
 
-	if(empty($selQuery[$relModule][$_SESSION['MAILMERGE_MODULE']])){
-		$select = generateSelect($seed, $relModule);
-	}else{
-		$select = $selQuery[$relModule][$_SESSION['MAILMERGE_MODULE']];
-	}
-	if(empty($whereQuery[$relModule][$_SESSION['MAILMERGE_MODULE']])){
-		$where = "{$seed->table_name}.id = ";
-	}else{
-		$where = $whereQuery[$relModule][$_SESSION['MAILMERGE_MODULE']];
-	}
-	
-	if($relModule == "Contacts"){
-	$limitSelect = str_replace('contacts.*', 'contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered', $select);
-	}
-	else{
-		$limitSelect = str_replace(strtolower($relModule).'.*', strtolower($relModule).'.name, '.strtolower($relModule).'.date_entered', $select);
-	}
-	$fullQuery = $limitSelect." WHERE ".$where."'".$key."' ORDER BY date_entered";
-	
+	$fullQuery = get_merge_query($seed, $_SESSION['MAILMERGE_MODULE'], $key);
 	$result = $seed->db->limitQuery($fullQuery, 0, 1, true, "Error performing limit query");
+
 	$full_name = '';
 	$contact_id = '';
 	if($row = $seed->db->fetchByAssoc($result, 0)) {
-			if($relModule == "Contacts"){
-			$full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
-			}
-			else{
+			if($relModule == "Contacts") {
+			    $full_name = $locale->getLocaleFormattedName($row['first_name'], $row['last_name']);
+			} else {
 				$full_name = $row['name'];
 			}
 			$contact_id = $row['id'];
 	}
-	$change_parent_button = "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']."' tabindex='2'  type='button' class='button' value='".$app_strings['LBL_SELECT_BUTTON_LABEL']."' name='button' onclick='open_popup(document.EditView.rel_type_".$code.".value, 600, 400, \"&html=mail_merge&select=$select&where=$where&id=$key&request_data=$encoded_popup_request_data\", true, false, {});' $disabled/>";
+	$umodule =urlencode($_SESSION['MAILMERGE_MODULE']);
+	$ukey = urlencode($key);
+	$change_parent_button = "<input title='{$app_strings['LBL_SELECT_BUTTON_TITLE']}' tabindex='2'  type='button' class='button' value='{$app_strings['LBL_SELECT_BUTTON_LABEL']}'
+		name='button' onclick='open_popup(document.EditView.rel_type_{$code}.value, 600, 400,
+			\"&html=mail_merge&rel_module=$umodule&id=$ukey&request_data=$encoded_popup_request_data\", true, false, {});' $disabled/>";
 	$items = array(
 	'ID' => $key,
 	'NAME' => $value,
@@ -232,7 +169,7 @@ foreach($sel_obj as $key => $value)
 	);
 
 	$xtpl->assign("MAILMERGE", $items);
-	
+
 	if($oddRow)
    	{
         //todo move to themes
diff --git a/modules/MailMerge/Step4.php b/modules/MailMerge/Step4.php
index 7efcc570..7060f3a0 100644
--- a/modules/MailMerge/Step4.php
+++ b/modules/MailMerge/Step4.php
@@ -86,10 +86,10 @@ $relArray = array();
 //build relationship array
 foreach($sel_obj as $key=>$value)
 {
-	$id = 'rel_id_'.str_replace('-', '', $key);	
+	$id = 'rel_id_'.md5($key);
 	if(isset($_POST[$id]) && !empty($_POST[$id]))
 	{
-		$relArray[$key] = $_POST[$id];	
+		$relArray[$key] = $_POST[$id];
 	}
 }
 
@@ -106,7 +106,7 @@ require_once($beanFiles[$class_name]);
 
 	$seed = new $class_name();
 	foreach($sel_obj as $key=>$value)
-	{	
+	{
 		$builtArray[$key] = $value;
 		if(isset($relArray[$key]))
 		{
@@ -125,7 +125,7 @@ require_once($beanFiles[$class_name]);
 }
 else
 {
-	$builtArray = $sel_obj;	
+	$builtArray = $sel_obj;
 }
 
 $xtpl->assign("MAILMERGE_MODULE", $_SESSION['MAILMERGE_MODULE']);
@@ -144,7 +144,7 @@ else
 {
 	$xtpl->assign("PREV_STEP", "3");
 }
-	
+
 $xtpl->assign("STEP_NUM", "Step ".$step_num.":");
 
 $xtpl->parse("main");
diff --git a/modules/MailMerge/index.php b/modules/MailMerge/index.php
index cfee9047..4de9810d 100644
--- a/modules/MailMerge/index.php
+++ b/modules/MailMerge/index.php
@@ -54,5 +54,5 @@ else
 {
 	$step = '1';
 }
-include ('modules/MailMerge/Step'. clean_string($step). '.php'); 
+include ('modules/MailMerge/Step'. intval($step). '.php');
 ?>
\ No newline at end of file
diff --git a/modules/MailMerge/merge_query.php b/modules/MailMerge/merge_query.php
new file mode 100644
index 00000000..56c4e4e9
--- /dev/null
+++ b/modules/MailMerge/merge_query.php
@@ -0,0 +1,99 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+/**
+ * Create merge query depending on the modules being merged
+ * @param SugarBean $seed Object being queried
+ * @param string $merge_module Module being merged
+ * @param string $key ID of the record in module being merged
+ */
+function get_merge_query($seed, $merge_module, $key)
+{
+    $selQuery = array (
+'Contacts'=>array(
+	'Accounts' => 'SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts LEFT JOIN accounts_contacts ON contacts.id=accounts_contacts.contact_id AND (accounts_contacts.deleted is NULL or accounts_contacts.deleted=0)',
+	'Opportunities' => 'SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts LEFT JOIN opportunities_contacts ON contacts.id=opportunities_contacts.contact_id AND (opportunities_contacts.deleted is NULL or opportunities_contacts.deleted=0)',
+	'Cases' => 'SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts LEFT JOIN contacts_cases ON contacts.id=contacts_cases.contact_id AND (contacts_cases.deleted is NULL or contacts_cases.deleted=0)',
+	'Bugs' => 'SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts LEFT JOIN contacts_bugs ON contacts.id=contacts_bugs.contact_id AND (contacts_bugs.deleted is NULL or contacts_bugs.deleted=0)',
+	'Quotes' => 'SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts LEFT JOIN quotes_contacts ON contacts.id=quotes_contacts.contact_id AND (quotes_contacts.deleted is NULL or quotes_contacts.deleted=0)'
+),
+'Opportunities'=>array(
+	"Accounts"=>'SELECT opportunities.id, opportunities.name FROM opportunities LEFT JOIN accounts_opportunities ON opportunities.id = accounts_opportunities.opportunity_id AND (accounts_opportunities.deleted is NULL or accounts_opportunities.deleted=0)'
+),
+'Accounts'=>array(
+	"Opportunities"=>'SELECT accounts.id, accounts.name FROM accounts LEFT JOIN accounts_opportunities ON accounts.id = accounts_opportunities.account_id AND (accounts_opportunities.deleted is NULL or accounts_opportunities.deleted=0)'
+),
+);
+
+    $whereQuery = array(
+'Contacts' =>
+    array('Accounts' => 'accounts_contacts.contact_id = contacts.id AND accounts_contacts.account_id = ',
+	'Opportunities' => 'opportunities_contacts.contact_id = contacts.id AND opportunities_contacts.opportunity_id = ',
+	'Cases' => 'contacts_cases.contact_id = contacts.id AND contacts_cases.case_id = ',
+	'Bugs' => 'contacts_bugs.contact_id = contacts.id AND contacts_bugs.bug_id = ',
+	'Quotes' => 'quotes_contacts.contact_id = contacts.id AND quotes_contacts.quote_id = '
+    ),
+'Opportunities'=>array('Accounts'=>'accounts_opportunities.opportunity_id = opportunities.id AND accounts_opportunities.account_id = '),
+'Accounts'=>array('Opportunities'=>'accounts_opportunities.account_id = accounts.id  AND accounts_opportunities.opportunity_id = '),
+);
+
+    $relModule = $seed->module_dir;
+
+	$select = "";
+    if(!empty($selQuery[$relModule][$merge_module])){
+        $select = $selQuery[$relModule][$merge_module];
+	} else {
+	    $lowerRelModule = strtolower($relModule);
+	    if($seed->load_relationship($lowerRelModule)) {
+    		$params = array('join_table_alias' => 'r1', 'join_table_link_alias' => 'r2', 'join_type' => 'LEFT JOIN');
+	    	$join = $seed->$lowerRelModule->getJoin($params);
+		    $select = "SELECT {$seed->table_name}.* FROM {$seed->table_name} $join";
+	    }
+	}
+
+	if(empty($select)) {
+	    $select = "SELECT contacts.first_name, contacts.last_name, contacts.id, contacts.date_entered FROM contacts";
+	}
+
+	if(empty($whereQuery[$relModule][$merge_module])){
+		$select .= " WHERE {$seed->table_name}.id = '{$seed->db->quote($key)}'";
+	}else{
+		$select .= " WHERE ". $whereQuery[$relModule][$merge_module] . "'{$seed->db->quote($key)}'";
+	}
+    $select .=  " ORDER BY {$seed->table_name}.date_entered";
+    return $select;
+}
diff --git a/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php b/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php
index 38f69316..4d2aeb65 100644
--- a/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php
+++ b/modules/Meetings/Dashlets/MyMeetingsDashlet/MyMeetingsDashlet.php
@@ -169,12 +169,18 @@ class MyMeetingsDashlet extends DashletGeneric {
                                      'clear' => $GLOBALS['app_strings']['LBL_CLEAR_BUTTON_LABEL'],
                                      ));
 
-        require_once('modules/Meetings/Meeting.php');
-        $types = getMeetingsExternalApiDropDown();
-        $this->currentSearchFields['type']['input'] = '<select size="3" multiple="true" name="type[]">'
-                                     . get_select_options_with_id($types, (empty($this->filters['type']) ? '' : $this->filters['type']))
-                                     . '</select>';
-        $this->configureSS->assign('searchFields', $this->currentSearchFields);
+        // the 'type' search field exists in default dashlet's definition,
+        // but we need to check it anyways because user can re-define the search fields using he studio
+        // and the 'type' field can be removed
+        if (isset($this->currentSearchFields['type']))
+        {
+            require_once('modules/Meetings/Meeting.php');
+            $types = getMeetingsExternalApiDropDown();
+            $this->currentSearchFields['type']['input'] = '<select size="3" multiple="true" name="type[]">'
+                    . get_select_options_with_id($types, (empty($this->filters['type']) ? '' : $this->filters['type']))
+                    . '</select>';
+            $this->configureSS->assign('searchFields', $this->currentSearchFields);
+        }
 
         return $this->configureSS->fetch($this->configureTpl);
     }
diff --git a/modules/Meetings/Meeting.php b/modules/Meetings/Meeting.php
index d8a833aa..8ce93895 100644
--- a/modules/Meetings/Meeting.php
+++ b/modules/Meetings/Meeting.php
@@ -121,7 +121,7 @@ class Meeting extends SugarBean {
             $this->minutes_values = $GLOBALS['app_list_strings']['duration_intervals'];
         }
 	}
-	
+
 	/**
 	 * Disable edit if meeting is recurring and source is not Sugar. It should be edited only from Outlook.
 	 * @param $view string
@@ -241,8 +241,9 @@ class Meeting extends SugarBean {
 
                 }
             } else {
-                SugarApplication::appendErrorMessage($GLOBALS['app_strings']['ERR_EXTERNAL_API_SAVE_FAIL']);
-                return $this->id;
+                // Generic Message Provides no value to End User - Log the issue with message detail and continue
+                // SugarApplication::appendErrorMessage($GLOBALS['app_strings']['ERR_EXTERNAL_API_SAVE_FAIL']);
+                $GLOBALS['log']->warn('ERR_EXTERNAL_API_SAVE_FAIL' . ": " . $this->type . " - " .  $response['errorMessage']);
             }
 
             $api->logoff();
@@ -457,7 +458,7 @@ class Meeting extends SugarBean {
 		}
 		$this->email_reminder_checked = $this->email_reminder_time == -1 ? false : true;
 
-		if (isset ($_REQUEST['parent_type'])) {
+		if (isset ($_REQUEST['parent_type']) && empty($this->parent_type)) {
 			$this->parent_type = $_REQUEST['parent_type'];
 		} elseif (is_null($this->parent_type)) {
 			$this->parent_type = $app_list_strings['record_type_default_key'];
@@ -480,7 +481,7 @@ class Meeting extends SugarBean {
                 $meeting_fields['SET_COMPLETE'] = $setCompleteUrl . SugarThemeRegistry::current()->getImage("close_inline"," border='0'",null,null,'.gif',translate('LBL_CLOSEINLINE'))."</a>";
             } else {
                 $meeting_fields['SET_COMPLETE'] = '';
-            }			
+            }
 		}
 		global $timedate;
 		$today = $timedate->nowDb();
@@ -500,8 +501,7 @@ class Meeting extends SugarBean {
 		if (!empty($this->contact_id)) {
 			global $locale;
             // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
-            $contact_temp = new Contact();
-            $contact_temp->retrieve($this->contact_id);
+			$contact_temp = BeanFactory::getBean("Contacts", $this->contact_id);
             $contact_temp->_create_proper_name_field();
             $this->contact_name = $contact_temp->full_name;
 		}
diff --git a/modules/Meetings/MeetingFormBase.php b/modules/Meetings/MeetingFormBase.php
index 743b767f..410978e6 100644
--- a/modules/Meetings/MeetingFormBase.php
+++ b/modules/Meetings/MeetingFormBase.php
@@ -255,7 +255,9 @@ function handleSave($prefix,$redirect=true, $useRequired=false) {
 
 
 	if( (isset($_POST['isSaveFromDetailView']) && $_POST['isSaveFromDetailView'] == 'true') ||
-        (isset($_POST['is_ajax_call']) && !empty($_POST['is_ajax_call']) && !empty($focus->id) )
+        (isset($_POST['is_ajax_call']) && !empty($_POST['is_ajax_call']) && !empty($focus->id) ||
+        (isset($_POST['return_action']) && $_POST['return_action'] == 'SubPanelViewer') && !empty($focus->id))||
+         !isset($_POST['user_invitees']) // we need to check that user_invitees exists before processing, it is ok to be empty
     ){
         $focus->save(true);
         $return_id = $focus->id;
diff --git a/modules/Meetings/duration_dependency.js b/modules/Meetings/duration_dependency.js
index 710c497c..bffef81e 100644
--- a/modules/Meetings/duration_dependency.js
+++ b/modules/Meetings/duration_dependency.js
@@ -33,22 +33,25 @@
  * "Powered by SugarCRM".
  ********************************************************************************/
 function DurationDependency(start_field,end_field,duration_field,format){this.duration=0;this.start_field=start_field;this.end_field=end_field;this.duration_field=duration_field;this.format=format;this.lock_end_listener=false;var format_parts=this.format.split(" ");this.date_format=format_parts[0];this.time_format=format_parts[1];if(format_parts.length==3)
-this.time_format+=""+this.time_format[2];this.date_delimiter=/([-.\\/])/.exec(this.date_format)[0];this.time_delimiter=/([.:])/.exec(this.time_format)[0];this.has_meridiem=/p/i.test(this.format);var date_format_cleaned=this.date_format.replace(/%/g,"").replace(new RegExp(this.date_delimiter,'g'),"");this.month_pos=date_format_cleaned.search(/m/);this.day_pos=date_format_cleaned.search(/d/);this.year_pos=date_format_cleaned.search(/Y/);if(document.getElementById(end_field).value!="")
-this.calculate_duration();else
-this.change_duration();this.update_duration_fields();this.set_duration_handler();var self=this;YAHOO.util.Event.addListener(start_field,"change",function(){self.change_start();});YAHOO.util.Event.addListener(end_field,"change",function(){if(self.lock_end_listener)
-return;self.calculate_duration();self.update_duration_fields();self.set_duration_handler();});if(duration_field!=null){YAHOO.util.Event.addListener(duration_field,"change",function(){self.change_duration();self.update_duration_fields();SugarWidgetScheduler.update_time();});}}
-DurationDependency.prototype.calculate_duration=function(){try{var start=this.parse_date(document.getElementById(this.start_field).value);var end=this.parse_date(document.getElementById(this.end_field).value);this.duration=(end.getTime()-start.getTime())/ 1000;}catch(e){this.duration=0;}}
-DurationDependency.prototype.change_start=function(){this.lock_end_listener=true;var start=this.parse_date(document.getElementById(this.start_field).value);var end=new Date(start.getTime()+this.duration*1000);this.set_date(end,this.end_field);var self=this;setTimeout(function(){self.lock_end_listener=false;},300);}
-DurationDependency.prototype.change_duration=function(){this.lock_end_listener=true;this.duration=document.getElementById(this.duration_field).value;var start=this.parse_date(document.getElementById(this.start_field).value);var end=new Date(start.getTime()+this.duration*1000);this.set_date(end,this.end_field);var self=this;setTimeout(function(){self.lock_end_listener=false;},300);}
-DurationDependency.prototype.update_duration_fields=function(){var minutes=this.duration / 60;var hours_elm=document.getElementById(this.duration_field+"_hours");var minutes_elm=document.getElementById(this.duration_field+"_minutes");if(!hours_elm){hours_elm=document.createElement("input");hours_elm.setAttribute("type","hidden");hours_elm.name=this.duration_field+"_hours";hours_elm.id=hours_elm.name;document.getElementById(this.end_field).parentNode.appendChild(hours_elm);}
-if(!minutes_elm){minutes_elm=document.createElement("input");minutes_elm.setAttribute("type","hidden");minutes_elm.name=this.duration_field+"_minutes";minutes_elm.id=minutes_elm.name;document.getElementById(this.end_field).parentNode.appendChild(minutes_elm);}
+this.time_format+=""+this.time_format[2];this.date_delimiter=/([-.\\/])/.exec(this.date_format)[0];this.time_delimiter=/([.:])/.exec(this.time_format)[0];this.has_meridiem=/p/i.test(this.format);var delimiter=(this.date_delimiter=="."?"\\"+this.date_delimiter:this.date_delimiter);var date_format_cleaned=this.date_format.replace(/%/g,"").replace(new RegExp(delimiter,'g'),"");this.month_pos=date_format_cleaned.search(/m/);this.day_pos=date_format_cleaned.search(/d/);this.year_pos=date_format_cleaned.search(/Y/);if(YAHOO.util.Selector.query('input#'+end_field)[0].value!="")
+{this.calculate_duration();}
+else
+{this.change_duration();}
+this.update_duration_fields();this.set_duration_handler();var self=this;YAHOO.util.Event.addListener(YAHOO.util.Selector.query('input#'+start_field)[0],"change",function(){self.change_start();});YAHOO.util.Event.addListener(YAHOO.util.Selector.query('input#'+end_field)[0],"change",function(){if(self.lock_end_listener)
+{return;}
+self.calculate_duration();self.update_duration_fields();self.set_duration_handler();});if(duration_field!=null){YAHOO.util.Event.addListener(YAHOO.util.Selector.query('select#'+duration_field)[0],"change",function(){self.change_duration();self.update_duration_fields();SugarWidgetScheduler.update_time();});}}
+DurationDependency.prototype.calculate_duration=function(){try{var start=this.parse_date(YAHOO.util.Selector.query('input#'+this.start_field)[0].value);var end=this.parse_date(YAHOO.util.Selector.query('input#'+this.end_field)[0].value);this.duration=(end.getTime()-start.getTime())/ 1000;}catch(e){this.duration=0;}}
+DurationDependency.prototype.change_start=function(){this.lock_end_listener=true;var start=this.parse_date(YAHOO.util.Selector.query('input#'+this.start_field)[0].value);var end=new Date(start.getTime()+this.duration*1000);this.set_date(end,this.end_field);var self=this;setTimeout(function(){self.lock_end_listener=false;},300);}
+DurationDependency.prototype.change_duration=function(){this.lock_end_listener=true;this.duration=YAHOO.util.Selector.query('select#'+this.duration_field)[0].value;var start=this.parse_date(YAHOO.util.Selector.query('input#'+this.start_field)[0].value);var end=new Date(start.getTime()+this.duration*1000);this.set_date(end,this.end_field);var self=this;setTimeout(function(){self.lock_end_listener=false;},300);}
+DurationDependency.prototype.update_duration_fields=function(){var minutes=this.duration / 60;var hours_elm=YAHOO.util.Selector.query('input#'+this.duration_field+"_hours")[0];var minutes_elm=YAHOO.util.Selector.query('input#'+this.duration_field+"_minutes")[0];if(!hours_elm){hours_elm=document.createElement("input");hours_elm.setAttribute("type","hidden");hours_elm.name=this.duration_field+"_hours";hours_elm.id=hours_elm.name;YAHOO.util.Selector.query('input#'+this.end_field)[0].parentNode.appendChild(hours_elm);}
+if(!minutes_elm){minutes_elm=document.createElement("input");minutes_elm.setAttribute("type","hidden");minutes_elm.name=this.duration_field+"_minutes";minutes_elm.id=minutes_elm.name;YAHOO.util.Selector.query('input#'+this.end_field)[0].parentNode.appendChild(minutes_elm);}
 hours_elm.value=parseInt(minutes / 60);minutes_elm.value=parseInt(minutes%60);}
 DurationDependency.prototype.get_duration_text=function(){var minutes=this.duration / 60;var d=parseInt(minutes / 60 / 24);var h=parseInt((minutes / 60)%24);var m=parseInt(minutes%60);d=format_part(d,SUGAR.language.get('app_strings',(d>1)?'LBL_DURATION_DAYS':'LBL_DURATION_DAY'));h=format_part(h,SUGAR.language.get('app_strings',(h>1)?'LBL_DURATION_HOURS':'LBL_DURATION_HOUR'));m=format_part(m,SUGAR.language.get('app_strings',(m>1)?'LBL_DURATION_MINUTES':'LBL_DURATION_MINUTE'));function format_part(v,s){if(v==0)
 v="";else{v=v.toString();v=v+" "+s+" ";}
 return v;}
 return d+h+m;}
 DurationDependency.prototype.set_duration_handler=function(){if(this.duration_field==null)
-return;var dur_elm=document.getElementById(this.duration_field);if(dur_elm){if(this.duration>=0){this.add_custom_duration(dur_elm);}
+return;var dur_elm=YAHOO.util.Selector.query('select#'+this.duration_field)[0];if(dur_elm){if(this.duration>=0){this.add_custom_duration(dur_elm);}
 dur_elm.value="";dur_elm.value=this.duration;}}
 DurationDependency.prototype.add_custom_duration=function(dur_elm){for(var i=0;i<dur_elm.length;i++){if(dur_elm.options[i].className=='custom'){var el=dur_elm.options[i];el.parentNode.removeChild(el);}}
 var option_exists=false;var pos_index=0;var pos_found=false;for(var i=0;i<dur_elm.length;i++){var v=dur_elm.options[i].value;if(v==this.duration){var option_exists=true;break;}
@@ -70,6 +73,6 @@ date+=this.date_delimiter;if(i==this.year_pos)
 date+=year;if(i==this.month_pos)
 date+=month;if(i==this.day_pos)
 date+=day;}
-document.getElementById(field+"_date").value=date;document.getElementById(field+"_hours").value=hour;document.getElementById(field+"_minutes").value=minute;if(this.has_meridiem){var nodes=document.getElementById(field+"_meridiem").childNodes;for(var i=0;i<nodes.length;i++){if(nodes[i].value=="AM"){meridiem=meridiem.toUpperCase();break;}}
-document.getElementById(field+"_meridiem").value=meridiem;}
+YAHOO.util.Selector.query('input#'+field+"_date")[0].value=date;YAHOO.util.Selector.query('select#'+field+"_hours")[0].value=hour;YAHOO.util.Selector.query('select#'+field+"_minutes")[0].value=minute;if(this.has_meridiem){var nodes=YAHOO.util.Selector.query('select#'+field+"_meridiem")[0].childNodes;for(var i=0;i<nodes.length;i++){if(nodes[i].value=="AM"){meridiem=meridiem.toUpperCase();break;}}
+YAHOO.util.Selector.query('select#'+field+"_meridiem")[0].value=meridiem;}
 eval("combo_"+field+".update()");}
\ No newline at end of file
diff --git a/modules/Meetings/metadata/detailviewdefs.php b/modules/Meetings/metadata/detailviewdefs.php
index 4f21889b..f64a3438 100644
--- a/modules/Meetings/metadata/detailviewdefs.php
+++ b/modules/Meetings/metadata/detailviewdefs.php
@@ -127,7 +127,7 @@ array (
         ),
         array (
           array (
-            'name' => 'duration_hours',
+            'name' => 'duration',
             'customCode' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
             'label' => 'LBL_DURATION',
           ),
diff --git a/modules/Meetings/metadata/editviewdefs.php b/modules/Meetings/metadata/editviewdefs.php
index d23d7e98..3cf7012d 100644
--- a/modules/Meetings/metadata/editviewdefs.php
+++ b/modules/Meetings/metadata/editviewdefs.php
@@ -172,11 +172,12 @@ function formSubmitCheck(){ldelim}if(check_form(\'EditView\')){ldelim}document.E
                     {literal}
                     SUGAR.util.doWhen(function(){return typeof DurationDependency != "undefined" && typeof document.getElementById("duration") != "undefined"}, function(){
                         var duration_dependency = new DurationDependency("date_start","date_end","duration",date_time_format);
-                        initEditView($("#duration")[0].form);
+                        initEditView(YAHOO.util.Selector.query(\'select#duration\')[0].form);
                     });
                     {/literal}
                 </script>            
             ',
+            'customCodeReadOnly' => '{$fields.duration_hours.value}{$MOD.LBL_HOURS_ABBREV} {$fields.duration_minutes.value}{$MOD.LBL_MINSS_ABBREV} ',
           ),
         ),
         array (
diff --git a/modules/Meetings/metadata/quickcreatedefs.php b/modules/Meetings/metadata/quickcreatedefs.php
index 59f13b2d..7532c567 100644
--- a/modules/Meetings/metadata/quickcreatedefs.php
+++ b/modules/Meetings/metadata/quickcreatedefs.php
@@ -156,7 +156,7 @@ array (
                     {literal}
                     SUGAR.util.doWhen(function(){return typeof DurationDependency != "undefined" && typeof document.getElementById("duration") != "undefined"}, function(){
                         var duration_dependency = new DurationDependency("date_start","date_end","duration",date_time_format);
-                    	initEditView($("#duration")[0].form);
+                        initEditView(YAHOO.util.Selector.query(\'select#duration\')[0].form);
                     });
                     {/literal}
                 </script>            
diff --git a/modules/Meetings/vardefs.php b/modules/Meetings/vardefs.php
index 77e03fea..d23a4fc0 100644
--- a/modules/Meetings/vardefs.php
+++ b/modules/Meetings/vardefs.php
@@ -138,19 +138,22 @@ $dictionary['Meeting'] = array('table' => 'meetings',
     'name' => 'duration_hours',
     'vname' => 'LBL_DURATION_HOURS',
     'type' => 'int',
+    'group'=>'duration',
     'len' => '3',
     'comment' => 'Duration (hours)',
     'importable' => 'required',
     'required' => true,
+    'studio' => 'false',
   ),
   'duration_minutes' =>
   array (
     'name' => 'duration_minutes',
     'vname' => 'LBL_DURATION_MINUTES',
     'type' => 'int',
-    'group'=>'duration_hours',
+    'group'=>'duration',
     'len' => '2',
-    'comment' => 'Duration (minutes)'
+    'comment' => 'Duration (minutes)',
+    'studio' => 'false',
   ),
   'date_start' =>
   array (
diff --git a/modules/MergeRecords/Step1.html b/modules/MergeRecords/Step1.html
index 8b8c2a9a..f4d6876c 100644
--- a/modules/MergeRecords/Step1.html
+++ b/modules/MergeRecords/Step1.html
@@ -61,7 +61,7 @@
 
 	<table cellpadding="0" cellspacing="0" border="0" width="100%">
 		<tr>
-			<td><input title="{MOD.LBL_NEXT_STEP_TITLE}" class="button" onclick="this.form.action.value='Step2';" type="submit" name="button" value="  {MOD.LBL_NEXT_STEP_BUTTON_LABEL}  " > <input title="{APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='{RETURN_ACTION}'; this.form.module.value='{RETURN_MODULE}'; this.form.record.value='{RETURN_ID}';" type="submit" name="button" value="  {APP.LBL_CANCEL_BUTTON_LABEL}  "></td>
+			<td><input title="{MOD.LBL_NEXT_STEP_TITLE}" class="button" onclick="this.form.action.value='Step2';" type="submit" name="button" value="  {MOD.LBL_NEXT_STEP_BUTTON_LABEL}  " id="next_step_button"> <input title="{APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='{RETURN_ACTION}'; this.form.module.value='{RETURN_MODULE}'; this.form.record.value='{RETURN_ID}';" type="submit" name="button" value="  {APP.LBL_CANCEL_BUTTON_LABEL}  " id="cancel_merge_button"></td>
 			<td align='right'>{ADMIN_EDIT}</td>
 		</tr>
 	</table>
diff --git a/modules/MergeRecords/Step2.php b/modules/MergeRecords/Step2.php
index c10bb34f..b0419d75 100644
--- a/modules/MergeRecords/Step2.php
+++ b/modules/MergeRecords/Step2.php
@@ -166,8 +166,8 @@ $form_top = <<<EOQ
 			<input type="hidden" name="return_module" value="$focus->merge_module">
 			<input type="hidden" name="return_id" value="$return_id">
 			<input type="hidden" name="return_action" value="DetailView">
-			<input title="$button_title" class="button" onclick="return verify_selection(this);" type="submit" name="button" value="  $button_label  " >
-            <input title="$cancel_title" accessKey="$cancel_key" class="button" onclick="this.form.action.value='DetailView';this.form.module.value='$focus->merge_module';this.form.module.record='$return_id'" type="submit" name="button" value=" $cancel_label   " >
+			<input title="$button_title" class="button" onclick="return verify_selection(this);" type="submit" name="button" value="  $button_label  " id="perform_merge_button">
+            <input title="$cancel_title" accessKey="$cancel_key" class="button" onclick="this.form.action.value='DetailView';this.form.module.value='$focus->merge_module';this.form.module.record='$return_id'" type="submit" name="button" value=" $cancel_label   " id="cancel_merge_button" >
 		</form>
         <script>
            function verify_selection(theElement) {
diff --git a/modules/MergeRecords/Step3.html b/modules/MergeRecords/Step3.html
index de0f3c94..8c345cb8 100644
--- a/modules/MergeRecords/Step3.html
+++ b/modules/MergeRecords/Step3.html
@@ -54,8 +54,8 @@
 	
 	<table width="100%" cellpadding="0" cellspacing="0" border="0">
 	<tr>
-		<td align="left" style="padding-bottom: 2px;"><input title="{MOD.LBL_SAVE_MERGED_RECORD_BUTTON_TITLE}" class="button" onclick="return merge_verify();" type="submit" name="button" value="  {MOD.LBL_SAVE_MERGED_RECORD_BUTTON_LABEL}  " >&nbsp;
-		<input title="{APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='{RETURN_ACTION}'; this.form.module.value='{RETURN_MODULE}'; this.form.record.value='{RETURN_ID}'" type="submit" name="button" value="  {APP.LBL_CANCEL_BUTTON_LABEL}  "></td>
+		<td align="left" style="padding-bottom: 2px;"><input title="{MOD.LBL_SAVE_MERGED_RECORD_BUTTON_TITLE}" class="button" onclick="return merge_verify();" type="submit" name="button" value="  {MOD.LBL_SAVE_MERGED_RECORD_BUTTON_LABEL}  " id="save_merged_record_button" >&nbsp;
+		<input title="{APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="this.form.action.value='{RETURN_ACTION}'; this.form.module.value='{RETURN_MODULE}'; this.form.record.value='{RETURN_ID}'" type="submit" name="button" value="  {APP.LBL_CANCEL_BUTTON_LABEL}  " id="cancel_merge_button"></td>
 		<td align="right" nowrap><span class="required">{APP.LBL_REQUIRED_SYMBOL}</span> {APP.NTC_REQUIRED}</td>
 	</tr>
 	</table>
diff --git a/modules/ModuleBuilder/MB/MBModule.php b/modules/ModuleBuilder/MB/MBModule.php
index e6c4082b..fada7609 100644
--- a/modules/ModuleBuilder/MB/MBModule.php
+++ b/modules/ModuleBuilder/MB/MBModule.php
@@ -178,7 +178,7 @@ class MBModule
 
     function fieldExists ($name = '' , $type = '')
     {
-        $vardefs = $this->mbvardefs->getVardef () ;
+        $vardefs = $this->getVardefs();
         if (! empty ( $vardefs ))
         {
             if (empty ( $type ) && empty ( $name ))
diff --git a/modules/ModuleBuilder/Module/DropDownBrowser.php b/modules/ModuleBuilder/Module/DropDownBrowser.php
index 00909a56..84e624eb 100644
--- a/modules/ModuleBuilder/Module/DropDownBrowser.php
+++ b/modules/ModuleBuilder/Module/DropDownBrowser.php
@@ -37,6 +37,15 @@
 
 class DropDownBrowser
 {
+    // Restrict the full dropdown list to remove some options that shouldn't be edited by the end users
+    public static $restrictedDropdowns = array(
+        'eapm_list',
+        'eapm_list_documents',
+        'eapm_list_import',
+        'extapi_meeting_password',
+        // 'moduleList', // We may want to put this in at a later date
+        // 'moduleListSingular', // Same with this
+    );
  
     function getNodes()
     {
@@ -51,6 +60,11 @@ class DropDownBrowser
         		unset($my_list_strings[$key]);
         	}
         }
+
+        foreach ( self::$restrictedDropdowns as $restrictedDropdown ) {
+            unset($my_list_strings[$restrictedDropdown]);
+        }
+
         $dropdowns = array_keys($my_list_strings);
         asort($dropdowns);
         foreach($dropdowns as $dd)
diff --git a/modules/ModuleBuilder/javascript/SimpleList.js b/modules/ModuleBuilder/javascript/SimpleList.js
index 59586b98..55f9cb8b 100644
--- a/modules/ModuleBuilder/javascript/SimpleList.js
+++ b/modules/ModuleBuilder/javascript/SimpleList.js
@@ -124,7 +124,7 @@ if(typeof(SimpleList) == 'undefined'){
         }
         html += "</span>";
         html += "<span class='fieldValue' id='span_edit_"+liObj.id+"' style='display:none'>";
-        html += "<input type='text' id='input_"+liObj.id+"' value=\""+drop_value.value+"\" onchange='SimpleList.setDropDownValue(\""+liObj.id+"\", unescape(this.value), true)' >";
+        html += "<input type='text' id='input_"+liObj.id+"' value=\""+YAHOO.lang.escapeHTML(drop_value.value)+"\" onchange='SimpleList.setDropDownValue(\""+liObj.id+"\", unescape(this.value), true)' >";
         html += "</span>";
         html += "</td><td align='right'><a href='javascript:void(0)' onclick='SimpleList.editDropDownValue(\""+liObj.id+"\", true)'>"+SimpleList.editImage+"</a>";
         html += "&nbsp;<a href='javascript:void(0)' onclick='SimpleList.deleteDropDownValue(\""+liObj.id+"\", true)'>"+SimpleList.deleteImage+"</a>";
diff --git a/modules/ModuleBuilder/parsers/StandardField.php b/modules/ModuleBuilder/parsers/StandardField.php
index 9fd730e4..c7eb5b6f 100644
--- a/modules/ModuleBuilder/parsers/StandardField.php
+++ b/modules/ModuleBuilder/parsers/StandardField.php
@@ -91,6 +91,21 @@ class StandardField extends DynamicField
             return false;
 
         $currdef = $dictionary[$bean_name]["fields"][$field->name];
+
+        // set $field->unified_search=true if field supports unified search
+        // regarding #51427
+        if($field->supports_unified_search)
+        {
+            if(isset($dictionary[$bean_name]['unified_search_default_enabled']) && isset($dictionary[$bean_name]['unified_search'])
+            && $dictionary[$bean_name]['unified_search_default_enabled'] && $dictionary[$bean_name]['unified_search'])
+            {
+                $currdef['unified_search'] = $field->unified_search = isset($currdef['unified_search'])
+                 ? $currdef['unified_search']
+                 : true;
+            }
+        }
+        // end #51427
+
         $this->loadCustomDef($field->name);
         $this->loadBaseDef($field->name);
         $newDef = $field->get_field_def();
diff --git a/modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php b/modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php
index 7ffe633a..67952860 100644
--- a/modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php
+++ b/modules/ModuleBuilder/parsers/views/DashletMetaDataParser.php
@@ -88,7 +88,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 	    	}
 	    	}
     		$viewdefs = array_change_key_case($viewdefs['searchfields']);
-    		$viewdefs = $this->_viewdefs = $this->convertSearchToListDefs($viewdefs);
+            $viewdefs = $this->_viewdefs = $this->ConvertSearchToDashletDefs($viewdefs);
     	}
     	else if ($this->_view == MB_DASHLET && isset($viewdefs['columns']))
     	{
diff --git a/modules/ModuleBuilder/tpls/editProperty.tpl b/modules/ModuleBuilder/tpls/editProperty.tpl
index c1077a1b..83a39c53 100644
--- a/modules/ModuleBuilder/tpls/editProperty.tpl
+++ b/modules/ModuleBuilder/tpls/editProperty.tpl
@@ -60,7 +60,7 @@
 				{
 					var property = field.name.substring('editProperty_'.length);
 					var id = field.id.substring('editProperty_'.length);
-					document.getElementById(id).innerHTML = escape(field.value);
+					document.getElementById(id).innerHTML = YAHOO.lang.escapeHTML(field.value);
 				}
 			}
 		}
diff --git a/modules/ModuleBuilder/views/view.modulefields.php b/modules/ModuleBuilder/views/view.modulefields.php
index a7f6e0f9..bc6aeb3a 100644
--- a/modules/ModuleBuilder/views/view.modulefields.php
+++ b/modules/ModuleBuilder/views/view.modulefields.php
@@ -145,6 +145,22 @@ class ViewModulefields extends SugarView
                 $this->mbModule->setModStrings('en_us',$mod_strings);
             }
 
+            foreach($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
+            {
+                if ($k != $this->mbModule->name)
+                {
+                    foreach($v as $field => $def)
+                    {
+                        if (in_array($field, array_keys($this->mbModule->mbvardefs->vardefs['fields'][$this->mbModule->name])))
+                        {
+                            $this->mbModule->mbvardefs->vardefs['fields'][$k][$field] = $this->mbModule->mbvardefs->vardefs['fields'][$this->mbModule->name][$field];
+
+                            unset($this->mbModule->mbvardefs->vardefs['fields'][$this->mbModule->name][$field]);
+                        }
+                    }
+                }
+            }
+
             foreach($this->mbModule->mbvardefs->vardefs['fields'] as $k=>$v)
             {
                 if($k != $module_name)
diff --git a/modules/ProjectTask/ProjectTask.php b/modules/ProjectTask/ProjectTask.php
index 36935391..df960115 100644
--- a/modules/ProjectTask/ProjectTask.php
+++ b/modules/ProjectTask/ProjectTask.php
@@ -84,7 +84,10 @@ class ProjectTask extends SugarBean {
 	var $relationship_fields = array(
 		'email_id' => 'emails',
 	);
-
+    /**
+     * @var bool skip updating parent percent complete
+     */
+    protected $_skipParentUpdate = false;
 	
 	//////////////////////////////////////////////////////////////////
 	// METHODS
@@ -116,7 +119,13 @@ class ProjectTask extends SugarBean {
 
 		}
 	}
-
+    /**
+     * @param bool $skip updating parent percent complete
+     */
+    public function skipParentUpdate($skip = true)
+    {
+        $this->_skipParentUpdate = $skip;
+    }
 	function save($check_notify = FALSE)
 	{
 		//Bug 46012.  When saving new Project Tasks instance in a workflow, make sure we set a project_task_id value
@@ -127,7 +136,10 @@ class ProjectTask extends SugarBean {
         }
         
         $id = parent::save($check_notify);
-        $this->updateParentProjectTaskPercentage();
+        if($this->_skipParentUpdate == false)
+        {
+            $this->updateStatistic();
+        }
         return $id;
 	}
 
@@ -385,47 +397,60 @@ class ProjectTask extends SugarBean {
             if ($parentProjectTask)
             {
                 $subProjectTasks = $parentProjectTask->getAllSubProjectTasks();
-
-                $totalHours = 0;
-                $cumulativeDone = 0;
-
-                //update cumulative calculation - mimics gantt calculation
-                foreach ($subProjectTasks as $key => $value)
-                {
-                    if ($value->duration == "")
-                    {
-                        $value->duration = 0;
-                    }
-
-                    if ($value->percent_complete == "")
-                    {
-                        $value->percent_complete = 0;
-                    }
-
-                    if ($value->duration_unit == "Hours")
-                    {
-                        $totalHours += $value->duration;
-                        $cumulativeDone += $value->duration * ($value->percent_complete / 100);
-                    }
-                    else
-                    {
-                        $totalHours += ($value->duration * 8);
-                        $cumulativeDone += ($value->duration * 8) * ($value->percent_complete / 100);
-                    }
-                }
-
-                $cumulativePercentage = 0;
-				if ($totalHours != 0)
+                $tasks = array();
+                foreach($subProjectTasks as &$task)
                 {
-					$cumulativePercentage = ($cumulativeDone/$totalHours) * 100;
+                    array_push($tasks, $task->toArray(true));
                 }
-
-                $parentProjectTask->percent_complete = round($cumulativePercentage);
+                $parentProjectTask->percent_complete = $this->_calculateCompletePercent($tasks);
+                unset($tasks);
                 $parentProjectTask->save(isset($GLOBALS['check_notify']) ? $GLOBALS['check_notify'] : '');
             }
 		}
 	}
 
+    /**
+     * Calculate percent complete for parent task based on it's children tasks
+     * @param $subProjectTasks mixed Array of children tasks
+     * @return int percent complete
+     */
+    private function _calculateCompletePercent(&$subProjectTasks)
+    {
+        $totalHours = 0;
+        $cumulativeDone = 0;
+        //update cumulative calculation - mimics gantt calculation
+        foreach ($subProjectTasks as $key => &$value)
+        {
+            if ($value['duration'] == "")
+            {
+                $value['duration'] = 0;
+            }
+
+            if ($value['percent_complete'] == "")
+            {
+                $value['percent_complete'] = 0;
+            }
+
+            if ($value['duration_unit'] == "Hours")
+            {
+                $totalHours += $value['duration'];
+                $cumulativeDone += $value['duration'] * ($value['percent_complete'] / 100);
+            }
+            else
+            {
+                $totalHours += ($value['duration'] * 8);
+                $cumulativeDone += ($value['duration'] * 8) * ($value['percent_complete'] / 100);
+            }
+        }
+
+        $cumulativePercentage = 0;
+        if ($totalHours != 0)
+        {
+            $cumulativePercentage = round(($cumulativeDone/$totalHours) * 100);
+        }
+        return $cumulativePercentage;
+    }
+
     /**
     * Retrieves the parent project task of a project task
     * returns project task bean
@@ -550,6 +575,129 @@ class ProjectTask extends SugarBean {
     	}
         return 0;
     }	
+
+    /**
+     * Update percent complete for project tasks with children tasks based on children's values
+     */
+    public function updateStatistic()
+    {
+        /**
+         * @var array Array of tasks for current project
+         */
+        $list = array();
+        /**
+         * @var array Key-value array of project_task_id => parent_task_id
+         */
+        $tree = array();
+        /**
+         * @var array Array with nodes which have childrens
+         */
+        $nodes = array();
+        /**
+         * @var array Array with IDs of list which have been changed
+         */
+        $changed = array();
+
+        $db = DBManagerFactory::getInstance();
+        $this->disable_row_level_security = true;
+        $query = $this->create_new_list_query('', "project_id = {$db->quoted($this->project_id)}");
+        $this->disable_row_level_security = false;
+        $res = $db->query($query);
+        while($row = $db->fetchByAssoc($res))
+        {
+            array_push($list, $row);
+        }
+        // fill in $tree
+        foreach($list as $k => &$v)
+        {
+            if(isset($v['project_task_id']) && $v['project_task_id'] != '')
+            {
+                $tree[$v['project_task_id']] = $v['parent_task_id'];
+                if(isset($v['parent_task_id']) && $v['parent_task_id'])
+                {
+                    if(!isset($nodes[$v['parent_task_id']]))
+                    {
+                        $nodes[$v['parent_task_id']] = 1;
+                    }
+                }
+            }
+        }
+        unset($v);
+        // fill in $nodes array
+        foreach($nodes as $k => &$v)
+        {
+            $run = true;
+            $i = $k;
+            while($run)
+            {
+                if(isset($tree[$i]) &&  $tree[$i]!= '')
+                {
+                    $i = $tree[$i];
+                    $v++;
+                }
+                else
+                {
+                    $run = false;
+                }
+            }
+        }
+        arsort($nodes);
+        unset($v);
+        // calculating of percentages and comparing calculated value with database one
+        foreach($nodes as $k => &$v)
+        {
+            $currRow = null;
+            $currChildren = array();
+            $run = true;
+            $tmp = array();
+            $i = $k;
+            while($run)
+            {
+                foreach($list as $id => &$taskRow)
+                {
+                    if($taskRow['project_task_id'] == $i && $currRow === null)
+                    {
+                        $currRow = $id;
+                    }
+                    if($taskRow['parent_task_id'] == $i)
+                    {
+                        if(!in_array($taskRow['project_task_id'], array_keys($nodes)))
+                        {
+                            array_push($currChildren, $taskRow);
+                        }
+                        else
+                        {
+                            array_push($tmp, $taskRow['project_task_id']);
+                        }
+                    }
+                }
+                unset($taskRow);
+                if(count($tmp) == 0)
+                {
+                    $run = false;
+                }
+                else
+                {
+                    $i = array_shift($tmp);
+                }
+            }
+            $subres = $this->_calculateCompletePercent($currChildren);
+            if($subres != $list[$currRow]['percent_complete'])
+            {
+                $list[$currRow]['percent_complete'] = $subres;
+                array_push($changed, $currRow);
+            }
+        }
+        unset($v);
+        // updating data in database for changed tasks
+        foreach($changed as $k => &$v)
+        {
+            $task = BeanFactory::getBean('ProjectTask');
+            $task->populateFromRow($list[$v]);
+            $task->skipParentUpdate();
+            $task->save(false);
+        }
+    }
 }
 
 function getUtilizationDropdown($focus, $field, $value, $view) {
diff --git a/modules/Prospects/tpls/QuickCreate.tpl b/modules/Prospects/tpls/QuickCreate.tpl
index 84ed7312..69f9e448 100644
--- a/modules/Prospects/tpls/QuickCreate.tpl
+++ b/modules/Prospects/tpls/QuickCreate.tpl
@@ -51,8 +51,8 @@
 <input type="hidden" name="return_action" value="{$smarty.request.return_action}">
 <input type="hidden" name="return_id" value="{$smarty.request.return_id}">
 <input type="hidden" name="contact_role">
-{if !empty($smarty.request.return_module)}
-<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif empty($isDCForm)}{$smarty.request.return_module}{/if}">
+{if !empty($smarty.request.return_module) || !empty($smarty.request.relate_to)}
+<input type="hidden" name="relate_to" value="{if $smarty.request.return_relationship}{$smarty.request.return_relationship}{elseif $smarty.request.relate_to && empty($smarty.request.from_dcmenu)}{$smarty.request.relate_to}{elseif empty($isDCForm) && empty($smarty.request.from_dcmenu)}{$smarty.request.return_module}{/if}">
 <input type="hidden" name="relate_id" value="{$smarty.request.return_id}">
 {/if}
 <input type="hidden" name="offset" value="{$offset}">
diff --git a/modules/Schedulers/Scheduler.php b/modules/Schedulers/Scheduler.php
index 241aa806..ee50e81c 100644
--- a/modules/Schedulers/Scheduler.php
+++ b/modules/Schedulers/Scheduler.php
@@ -805,7 +805,7 @@ class Scheduler extends SugarBean {
 	 * ones.
 	 */
 	function rebuildDefaultSchedulers() {
-		global $mod_strings;
+		$mod_strings = return_module_language($GLOBALS['current_language'], 'Schedulers');
 		// truncate scheduler-related tables
 		$this->db->query('DELETE FROM schedulers');
 
@@ -885,6 +885,17 @@ class Scheduler extends SugarBean {
         $sched12->catch_up           = '0';
         $sched12->save();
 
+        $sched13 = new Scheduler();
+        $sched13->name               = $mod_strings['LBL_OOTB_CLEANUP_QUEUE'];
+        $sched13->job                = 'function::cleanJobQueue';
+        $sched13->date_time_start    = create_date(2012,1,1) . ' ' . create_time(0,0,1);
+        $sched13->date_time_end      = create_date(2030,12,31) . ' ' . create_time(23,59,59);
+        $sched13->job_interval       = '0::5::*::*::*';
+        $sched13->status             = 'Active';
+        $sched13->created_by         = '1';
+        $sched13->modified_user_id   = '1';
+        $sched13->catch_up           = '0';
+        $sched13->save();
 	}
 
 	////	END SCHEDULER HELPER FUNCTIONS
diff --git a/modules/Schedulers/_AddJobsHere.php b/modules/Schedulers/_AddJobsHere.php
index 6c81bedb..4f867972 100644
--- a/modules/Schedulers/_AddJobsHere.php
+++ b/modules/Schedulers/_AddJobsHere.php
@@ -64,6 +64,7 @@ $job_strings = array (
 	4 => 'trimTracker',
 	/*4 => 'securityAudit()',*/
     12 => 'sendEmailReminders',
+    14 => 'cleanJobQueue',
 
 );
 
@@ -438,6 +439,26 @@ function sendEmailReminders(){
 
 
 
+function cleanJobQueue($job)
+{
+    $td = TimeDate::getInstance();
+    // soft delete all jobs that are older than cutoff
+    $soft_cutoff = 7;
+    if(isset($GLOBALS['sugar_config']['jobs']['soft_lifetime'])) {
+        $soft_cutoff = $GLOBALS['sugar_config']['jobs']['soft_lifetime'];
+    }
+    $soft_cutoff_date = $job->db->quoted($td->getNow()->modify("- $soft_cutoff days")->asDb());
+    $job->db->query("UPDATE {$job->table_name} SET deleted=1 WHERE status='done' AND date_modified < ".$job->db->convert($soft_cutoff_date, 'datetime'));
+    // hard delete all jobs that are older than hard cutoff
+    $hard_cutoff = 21;
+    if(isset($GLOBALS['sugar_config']['jobs']['hard_lifetime'])) {
+        $hard_cutoff = $GLOBALS['sugar_config']['jobs']['hard_lifetime'];
+    }
+    $hard_cutoff_date = $job->db->quoted($td->getNow()->modify("- $hard_cutoff days")->asDb());
+    $job->db->query("DELETE FROM {$job->table_name} WHERE status='done' AND date_modified < ".$job->db->convert($hard_cutoff_date, 'datetime'));
+    return true;
+}
+
 if (file_exists('custom/modules/Schedulers/_AddJobsHere.php')) {
 	require('custom/modules/Schedulers/_AddJobsHere.php');
 }
diff --git a/modules/Schedulers/language/en_us.lang.php b/modules/Schedulers/language/en_us.lang.php
index 38473447..7c8cd796 100644
--- a/modules/Schedulers/language/en_us.lang.php
+++ b/modules/Schedulers/language/en_us.lang.php
@@ -55,6 +55,7 @@ $mod_strings = array (
 'LBL_OOTB_TRACKER'		=> 'Prune Tracker Tables',
 'LBL_UPDATE_TRACKER_SESSIONS' => 'Update tracker_sessions Table',
 'LBL_OOTB_SEND_EMAIL_REMINDERS'	=> 'Run Email Reminder Notifications',
+'LBL_OOTB_CLEANUP_QUEUE' => 'Clean Jobs Queue',
 
 // List Labels
 'LBL_LIST_JOB_INTERVAL' => 'Interval:',
@@ -158,5 +159,6 @@ $mod_strings = array (
 'LBL_PRUNEDATABASE' => 'Prune Database on 1st of Month',
 'LBL_TRIMTRACKER' => 'Prune Tracker Tables',
 'LBL_SENDEMAILREMINDERS'=> 'Run Email Reminders Sending',
+'LBL_CLEANJOBQUEUE' => 'Cleanup Job Queue',
 );
 ?>
diff --git a/modules/SchedulersJobs/vardefs.php b/modules/SchedulersJobs/vardefs.php
index 19b11c06..318114a6 100644
--- a/modules/SchedulersJobs/vardefs.php
+++ b/modules/SchedulersJobs/vardefs.php
@@ -175,7 +175,15 @@ $dictionary['SchedulersJob'] = array('table' => 'job_queue',
 			'vname' => 'LBL_PERCENT',
 			'type' => 'int',
 			'required' => false,
-		),
+	    	),
+	    'schedulers' => array (
+			'name'            => 'schedulers',
+			'vname'            => 'LBL_SCHEDULER_ID',
+			'type'            => 'link',
+			'relationship'    => 'schedulers_jobs_rel',
+			'source'        => 'non-db',
+	        'link_type' => 'one',
+	   ),
 		),
 	'indices' => array (
 		array(
diff --git a/modules/SugarFeed/tpls/AdminSettings.tpl b/modules/SugarFeed/tpls/AdminSettings.tpl
index 9645d13c..205c7ef1 100644
--- a/modules/SugarFeed/tpls/AdminSettings.tpl
+++ b/modules/SugarFeed/tpls/AdminSettings.tpl
@@ -46,9 +46,9 @@
 <table width="100%" cellpadding="0" cellspacing="0" border="0" class="actionsContainer">
 <tr>
 <td width="100%" colspan="2">
-<input type="button" onclick="document.AdminSettings.process.value='true'; if(check_form('AdminSettings')) {ldelim} document.AdminSettings.submit(); {rdelim}" class="button primary" title="{$app.LBL_SAVE_BUTTON_TITLE}" accessKey="{$app.LBL_SAVE_BUTTON_KEY}" value="{$app.LBL_SAVE_BUTTON_LABEL}">
-<input type="button" onclick="document.AdminSettings.process.value='false'; document.AdminSettings.submit();" class="button" title="{$app.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$app.LBL_CANCEL_BUTTON_KEY}" value="{$app.LBL_CANCEL_BUTTON_LABEL}">
-<input type="button" onclick="document.AdminSettings.process.value='deleteRecords'; if(confirm('{$mod.LBL_CONFIRM_DELETE_RECORDS}')) document.AdminSettings.submit();" class="button" title="{$mod.LBL_FLUSH_RECORDS}" value="{$mod.LBL_FLUSH_RECORDS}">
+<input type="button" id="activityStream_admin_save" onclick="document.AdminSettings.process.value='true'; if(check_form('AdminSettings')) {ldelim} document.AdminSettings.submit(); {rdelim}" class="button primary" title="{$app.LBL_SAVE_BUTTON_TITLE}" accessKey="{$app.LBL_SAVE_BUTTON_KEY}" value="{$app.LBL_SAVE_BUTTON_LABEL}">
+<input type="button" id="activityStream_admin_cancel" onclick="document.AdminSettings.process.value='false'; document.AdminSettings.submit();" class="button" title="{$app.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$app.LBL_CANCEL_BUTTON_KEY}" value="{$app.LBL_CANCEL_BUTTON_LABEL}">
+<input type="button" id="activityStream_admin_delete" onclick="document.AdminSettings.process.value='deleteRecords'; if(confirm('{$mod.LBL_CONFIRM_DELETE_RECORDS}')) document.AdminSettings.submit();" class="button" title="{$mod.LBL_FLUSH_RECORDS}" value="{$mod.LBL_FLUSH_RECORDS}">
 </td>
 </tr>
 </table>
diff --git a/modules/Tasks/Task.php b/modules/Tasks/Task.php
index 6da557f4..136cbdbc 100644
--- a/modules/Tasks/Task.php
+++ b/modules/Tasks/Task.php
@@ -300,8 +300,7 @@ class Task extends SugarBean {
 		//make sure we grab the localized version of the contact name, if a contact is provided
 		if (!empty($this->contact_id)) {
             // Bug# 46125 - make first name, last name, salutation and title of Contacts respect field level ACLs
-            $contact = new Contact();
-			$contact->retrieve($this->contact_id);
+            $contact = BeanFactory::getBean("Contacts", $this->contact_id);
 			if(isset($contact->id)) {
 			    $this->contact_name = $contact->full_name;
                 $this->contact_phone = $contact->phone_work;
diff --git a/modules/UpgradeWizard/language/en_us.lang.php b/modules/UpgradeWizard/language/en_us.lang.php
index f796df02..2a0a94dc 100644
--- a/modules/UpgradeWizard/language/en_us.lang.php
+++ b/modules/UpgradeWizard/language/en_us.lang.php
@@ -115,6 +115,7 @@ $mod_strings = array(
 	'LBL_UW_COMPLIANCE_MBSTRING'				=> 'MBStrings Module',
 	'LBL_UW_COMPLIANCE_MBSTRING_FUNC_OVERLOAD'	=> 'MBStrings mbstring.func_overload Parameter',
 	'LBL_UW_COMPLIANCE_MEMORY'					=> 'PHP Setting: Memory Limit',
+    'LBL_UW_COMPLIANCE_STREAM'                  => 'PHP Setting: Stream',
 	'LBL_UW_COMPLIANCE_MSSQL_MAGIC_QUOTES'		=> 'MS SQL Server & PHP Magic Quotes GPC',
 	'LBL_UW_COMPLIANCE_MYSQL'					=> 'Minimum MySQL Version',
     'LBL_UW_COMPLIANCE_DB'                      => 'Minimum Database Version',
@@ -307,4 +308,3 @@ $mod_strings = array(
 	'LBL_UPGRADE' => 'Upgrade' /*for 508 compliance fix*/,
 	'LBL_PROCESSING' => 'Processing' /*for 508 compliance fix*/,
 );
-?>
diff --git a/modules/UpgradeWizard/silentUpgrade.php b/modules/UpgradeWizard/silentUpgrade.php
index 42f4d264..4292199d 100644
--- a/modules/UpgradeWizard/silentUpgrade.php
+++ b/modules/UpgradeWizard/silentUpgrade.php
@@ -60,6 +60,13 @@ function build_argument_string($arguments=array()) {
    return $argument_string;
 }
 
+//Bug 52872. Dies if the request does not come from CLI.
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) != 'cli') {
+    die("This is command-line only script");
+}
+//End of #52872
+
 $php_path = '';
 $run_dce_upgrade = false;
 if(isset($argv[3]) && is_dir($argv[3]) && file_exists($argv[3]."/ini_setup.php")) {
diff --git a/modules/UpgradeWizard/silentUpgrade_dce_step1.php b/modules/UpgradeWizard/silentUpgrade_dce_step1.php
index ad32afef..b11a5e77 100644
--- a/modules/UpgradeWizard/silentUpgrade_dce_step1.php
+++ b/modules/UpgradeWizard/silentUpgrade_dce_step1.php
@@ -353,6 +353,12 @@ function threeWayMerge(){
 ////	END UTILITIES THAT MUST BE LOCAL :(
 ///////////////////////////////////////////////////////////////////////////////
 
+//Bug 52872. Dies if the request does not come from CLI.
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) != 'cli') {
+    die("This is command-line only script");
+}
+//End of #52872
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
diff --git a/modules/UpgradeWizard/silentUpgrade_dce_step2.php b/modules/UpgradeWizard/silentUpgrade_dce_step2.php
index 19c7d853..39761755 100644
--- a/modules/UpgradeWizard/silentUpgrade_dce_step2.php
+++ b/modules/UpgradeWizard/silentUpgrade_dce_step2.php
@@ -331,6 +331,12 @@ function threeWayMerge(){
 ////	END UTILITIES THAT MUST BE LOCAL :(
 ///////////////////////////////////////////////////////////////////////////////
 
+//Bug 52872. Dies if the request does not come from CLI.
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) != 'cli') {
+    die("This is command-line only script");
+}
+//End of #52872
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
diff --git a/modules/UpgradeWizard/silentUpgrade_step1.php b/modules/UpgradeWizard/silentUpgrade_step1.php
index 0ee33780..b187e47c 100644
--- a/modules/UpgradeWizard/silentUpgrade_step1.php
+++ b/modules/UpgradeWizard/silentUpgrade_step1.php
@@ -349,6 +349,12 @@ function threeWayMerge(){
 ////	END UTILITIES THAT MUST BE LOCAL :(
 ///////////////////////////////////////////////////////////////////////////////
 
+//Bug 52872. Dies if the request does not come from CLI.
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) != 'cli') {
+    die("This is command-line only script");
+}
+//End of #52872
 
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
diff --git a/modules/UpgradeWizard/silentUpgrade_step2.php b/modules/UpgradeWizard/silentUpgrade_step2.php
index 86a09fe5..0c0e6030 100644
--- a/modules/UpgradeWizard/silentUpgrade_step2.php
+++ b/modules/UpgradeWizard/silentUpgrade_step2.php
@@ -177,6 +177,13 @@ function rebuildRelations($pre_path = '')
 	include($pre_path.'modules/ACL/install_actions.php');
 }
 
+//Bug 52872. Dies if the request does not come from CLI.
+$sapi_type = php_sapi_name();
+if (substr($sapi_type, 0, 3) != 'cli') {
+    die("This is command-line only script");
+}
+//End of #52872
+
 // only run from command line
 if(isset($_SERVER['HTTP_USER_AGENT'])) {
 	fwrite(STDERR,'This utility may only be run from the command line or command prompt.');
diff --git a/modules/UpgradeWizard/systemCheck.php b/modules/UpgradeWizard/systemCheck.php
index bc848fa4..42eb5a45 100644
--- a/modules/UpgradeWizard/systemCheck.php
+++ b/modules/UpgradeWizard/systemCheck.php
@@ -166,6 +166,7 @@ $checks = array(
 	'safeModeStatus'			=> $mod_strings['LBL_UW_COMPLIANCE_SAFEMODE'],
 	'callTimeStatus'			=> $mod_strings['LBL_UW_COMPLIANCE_CALLTIME'],
 	'memory_msg'				=> $mod_strings['LBL_UW_COMPLIANCE_MEMORY'],
+    'stream_msg'                => $mod_strings['LBL_UW_COMPLIANCE_STREAM'],
     'ZipStatus'			        => $mod_strings['LBL_UW_COMPLIANCE_ZIPARCHIVE'],
 	//commenting mbstring overload.
 	//'mbstring.func_overload'	=> $mod_strings['LBL_UW_COMPLIANCE_MBSTRING_FUNC_OVERLOAD'],
diff --git a/modules/UpgradeWizard/uw_utils.php b/modules/UpgradeWizard/uw_utils.php
index 825af081..2d289728 100644
--- a/modules/UpgradeWizard/uw_utils.php
+++ b/modules/UpgradeWizard/uw_utils.php
@@ -226,12 +226,13 @@ function removeFileFromPath($file,$path, $deleteNot=array()){
 		}
 		if(!file_exists($path))return $removed;
 		$d = dir($path);
-		while($e = $d->read()){
+		while(false !== ($e = $d->read())){  // Fixed bug. !== is required to literally match the type and value of false, so that a filename that could evaluate and cast to false, ie "false" or "0", still allows the while loop to continue.  From example at http://www.php.net/manual/en/function.dir.php
 			$next = $path . '/'. $e;
 			if(substr($e, 0, 1) != '.' && is_dir($next)){
 				$removed += removeFileFromPath($file, $next, $deleteNot);
 			}
 		}
+		$d->close();  // from example at http://www.php.net/manual/en/function.dir.php
 		return $removed;
 	}
 
@@ -973,6 +974,7 @@ function checkSystemCompliance() {
 	global $current_language;
 	global $db;
 	global $mod_strings;
+    global $app_strings;
 
 	if(!defined('SUGARCRM_MIN_MEM')) {
 		define('SUGARCRM_MIN_MEM', 40);
@@ -1094,6 +1096,18 @@ function checkSystemCompliance() {
 
 
 
+    // Suhosin allow to use upload://
+    $ret['stream_msg'] = '';
+    if (UploadStream::getSuhosinStatus() == true)
+    {
+        $ret['stream_msg'] = "<b><span class=\"go\">{$installer_mod_strings['LBL_CHECKSYS_OK']}</span></b>";
+    }
+    else
+    {
+        $ret['stream_msg'] = "<b><span class=\"stop\">{$app_strings['ERR_SUHOSIN']}</span></b>";
+        $ret['error_found'] = true;
+    }
+
 	/* mbstring.func_overload
 	$ret['mbstring.func_overload'] = '';
 	$mb = ini_get('mbstring.func_overload');
@@ -4356,6 +4370,23 @@ function rebuildSprites($fromUpgrade=true)
         closedir($dh);
     }
 
+     // add all theme custom image directories
+    $custom_themes_dir = "custom/themes";
+    if (is_dir($custom_themes_dir)) {
+         if($dh = opendir($custom_themes_dir))
+         {
+             while (($dir = readdir($dh)) !== false)
+             {
+                 //Since the custom theme directories don't require an images directory
+                 // we check for it implicitly
+                 if ($dir != "." && $dir != ".." && is_dir('custom/themes/'.$dir."/images")) {
+                     $sb->addDirectory($dir, "custom/themes/{$dir}/images");
+                 }
+             }
+             closedir($dh);
+         }
+    }
+
     // generate the sprite goodies
     // everything is saved into cache/sprites
     $sb->createSprites();
diff --git a/modules/Users/Authenticate.php b/modules/Users/Authenticate.php
index c716623e..a1f4d8ca 100644
--- a/modules/Users/Authenticate.php
+++ b/modules/Users/Authenticate.php
@@ -47,7 +47,14 @@ if (!defined('SUGAR_PHPUNIT_RUNNER')) {
 }
 global $mod_strings;
 $login_vars = $GLOBALS['app']->getLoginVars(false);
-$authController->login($_REQUEST['user_name'], $_REQUEST['user_password']);
+
+$user_name = isset($_REQUEST['user_name'])
+    ? $_REQUEST['user_name'] : '';
+
+$password = isset($_REQUEST['user_password'])
+    ? $_REQUEST['user_password'] : '';
+
+$authController->login($user_name, $password);
 // authController will set the authenticated_user_id session variable
 if(isset($_SESSION['authenticated_user_id'])) {
 	// Login is successful
@@ -98,4 +105,4 @@ if(!empty($GLOBALS['app'])) {
 if (!defined('SUGAR_PHPUNIT_RUNNER')) {
     sugar_cleanup();
     header($url);
-}
\ No newline at end of file
+}
diff --git a/modules/Users/GeneratePassword.php b/modules/Users/GeneratePassword.php
index b66432f5..bfc144a0 100644
--- a/modules/Users/GeneratePassword.php
+++ b/modules/Users/GeneratePassword.php
@@ -49,6 +49,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
     global $app_strings;
     global $sugar_config;
     global $new_pwd;
+    global $current_user;
 
   	$mod_strings=return_module_language('','Users');
   	$res=$GLOBALS['sugar_config']['passwordsetting'];
@@ -56,16 +57,31 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 ///////////////////////////////////////////////////
 ///////  Retrieve user
+$username = '';
+$useremail = '';
+if(isset( $_POST['user_name'])){
+        $username = $_POST['user_name'];
+}else if(isset( $_POST['username'])){
+        $username = $_POST['username'];
+}
+
+if(isset( $_POST['Users0emailAddress0'])){
+        $useremail = $_POST['Users0emailAddress0'];
+}else if(isset( $_POST['user_email'])){
+        $useremail = $_POST['user_email'];
+}
 
     $usr= new user();
-    if(isset( $_POST['user_name']) && isset($_POST['Users0emailAddress0'] )){
-    	if ($_POST['user_name'] != '' && $_POST['Users0emailAddress0'] != ''){
-	        $usr_id=$usr->retrieve_user_id($_POST['user_name']);
-	        $usr->retrieve($usr_id);
-	        if ($usr->email1 !=  $_POST['Users0emailAddress0']){
-	            echo $mod_strings['ERR_PASSWORD_USERNAME_MISSMATCH'];
-	            return;
-    	    }
+    if(isset($username) && $username != '' && isset($useremail) && $useremail != '')
+    {
+        if ($username != '' && $useremail != ''){
+            $usr_id=$usr->retrieve_user_id($username);
+            $usr->retrieve($usr_id);
+            if ($usr->email1 !=  $useremail){
+                echo $mod_strings['LBL_PROVIDE_USERNAME_AND_EMAIL'];
+                return;
+            }
+
     	    if ($usr->portal_only || $usr->is_group){
 	            echo $mod_strings['LBL_PROVIDE_USERNAME_AND_EMAIL'];
 	            return;
@@ -82,15 +98,21 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
             $usr->retrieve($_POST['userId']);
         }
         else{
-        	if(isset( $_POST['sugar_user_name']) && isset($_POST['sugar_user_name'] )){
+        	if(!empty( $_POST['sugar_user_name'])){
 				$usr_id=$usr->retrieve_user_id($_POST['sugar_user_name']);
 	        	$usr->retrieve($usr_id);
 			}
     		else{
-    			echo  $mod_strings['ERR_USER_INFO_NOT_FOUND'];
+    			echo  $mod_strings['LBL_PROVIDE_USERNAME_AND_EMAIL'];
             	return;
     		}
     	}
+
+    	// Check if current_user is admin or the same user
+    	if(empty($current_user->id) || empty($usr->id) || ($usr->id != $current_user->id && !$current_user->is_admin)) {
+    	    echo  $mod_strings['LBL_PROVIDE_USERNAME_AND_EMAIL'];
+    	    return;
+    	}
     }
 
 ///////
@@ -106,158 +128,56 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 ///////
 ///////////////////////////////////////////////////
-
-
-	// if i need to generate a password (not a link)
-    if (!isset($_POST['link'])){
-	    $charBKT='';
-	    //chars to select from
-	    $LOWERCASE = "abcdefghijklmnpqrstuvwxyz";
-	    $NUMBER = "0123456789";
-	    $UPPERCASE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-	    $SPECIAL = '~!@#$%^&*()_+=-{}|';
-	    $condition = 0;
-	    $charBKT.=$UPPERCASE.$LOWERCASE.$NUMBER;
-	    $password="";
-
-	    	$lenght='6';
-	    // Create random characters for the ones that doesnt have requirements
-	    for ($i=0;$i<$lenght-$condition;$i++)  // loop and create password
-	       $password = $password . substr ($charBKT, rand() % strlen($charBKT), 1);
-
-    }
+    $isLink = isset($_POST['link']) && $_POST['link'] == '1';
+    // if i need to generate a password (not a link)
+    $password = $isLink ? '' : User::generatePassword();
 
 ///////////////////////////////////////////////////
 ///////  Create URL
 
 // if i need to generate a link
-if (isset($_POST['link']) && $_POST['link'] == '1'){
+if ($isLink){
 	global $timedate;
 	$guid=create_guid();
 	$url=$GLOBALS['sugar_config']['site_url']."/index.php?entryPoint=Changenewpassword&guid=$guid";
 	$time_now=TimeDate::getInstance()->nowDb();
-	//$q2="UPDATE `users_password_link` SET `deleted` = '1' WHERE `username` = '".$_POST['username']."'";
+	//$q2="UPDATE `users_password_link` SET `deleted` = '1' WHERE `username` = '".$username."'";
 	//$usr->db->query($q2);
-	$q = "INSERT INTO users_password_link (id, username, date_generated) VALUES('".$guid."','".$_POST['user_name']."',' ".$time_now."' ) ";
+	$q = "INSERT INTO users_password_link (id, username, date_generated) VALUES('".$guid."','".$username."','".$time_now."') ";
 	$usr->db->query($q);
 }
 ///////
 ///////////////////////////////////////////////////
 
 ///////  Email creation
-	global $sugar_config, $current_user;
-    if (isset($_POST['link']) && $_POST['link'] == '1')
+    if ($isLink)
     	$emailTemp_id = $res['lostpasswordtmpl'];
     else
     	$emailTemp_id = $res['generatepasswordtmpl'];
 
-    $emailTemp = new EmailTemplate();
-    $emailTemp->disable_row_level_security = true;
-    if ($emailTemp->retrieve($emailTemp_id) == ''){
-        echo $mod_strings['LBL_EMAIL_TEMPLATE_MISSING'];
-        $new_pwd='4';
-        return;}
-
-    //replace instance variables in email templates
-    $htmlBody = $emailTemp->body_html;
-    $body = $emailTemp->body;
-    if (isset($_POST['link']) && $_POST['link'] == '1'){
-    	$htmlBody = str_replace('$contact_user_link_guid', $url, $htmlBody);
-    	$body = str_replace('$contact_user_link_guid', $url, $body);
+    $additionalData = array(
+        'link' => $isLink,
+        'password' => $password
+    );
+    if (isset($url))
+    {
+        $additionalData['url'] = $url;
     }
-    else{
-    	$htmlBody = str_replace('$contact_user_user_hash', $password, $htmlBody);
-    	$body = str_replace('$contact_user_user_hash', $password, $body);
+    $result = $usr->sendEmailForPassword($emailTemp_id, $additionalData);
+    if ($result['status'] == false && $result['message'] != '')
+    {
+        echo $result['message'];
+        $new_pwd = '4';
+        return;
     }
-    // Bug 36833 - Add replacing of special value $instance_url
-    $htmlBody = str_replace('$config_site_url',$sugar_config['site_url'], $htmlBody);
-    $body = str_replace('$config_site_url',$sugar_config['site_url'], $body);
-
-    $htmlBody = str_replace('$contact_user_user_name', $usr->user_name, $htmlBody);
-    $htmlBody = str_replace('$contact_user_pwd_last_changed', TimeDate::getInstance()->nowDb(), $htmlBody);
-    $body = str_replace('$contact_user_user_name', $usr->user_name, $body);
-    $body = str_replace('$contact_user_pwd_last_changed', TimeDate::getInstance()->nowDb(), $body);
-    $emailTemp->body_html = $htmlBody;
-    $emailTemp->body = $body;
-    require_once('include/SugarPHPMailer.php');
 
-    $itemail=$usr->emailAddress->getPrimaryAddress($usr);
-    //retrieve IT Admin Email
-    //_ppd( $emailTemp->body_html);
-    //retrieve email defaults
-    $emailObj = new Email();
-    $defaults = $emailObj->getSystemDefaultEmail();
-    $mail = new SugarPHPMailer();
-    $mail->setMailerForSystem();
-    //$mail->IsHTML(true);
-    $mail->From = $defaults['email'];
-    $mail->FromName = $defaults['name'];
-    $mail->ClearAllRecipients();
-    $mail->ClearReplyTos();
-    $mail->Subject=from_html($emailTemp->subject);
-    if($emailTemp->text_only != 1){
-        $mail->IsHTML(true);
-        $mail->Body=from_html($emailTemp->body_html);
-        $mail->AltBody=from_html($emailTemp->body);
-    }
-    else {
-        $mail->Body_html=from_html($emailTemp->body_html);
-        $mail->Body=from_html($emailTemp->body);
-    }
-    if($mail->Body == '' && $current_user->is_admin){
-    	echo $app_strings['LBL_EMAIL_TEMPLATE_EDIT_PLAIN_TEXT'];
-        $new_pwd='4';
-    	return;}
-    if($mail->Mailer == 'smtp' && $mail->Host ==''&& $current_user->is_admin){
-    	echo $mod_strings['ERR_SERVER_SMTP_EMPTY'];
-        $new_pwd='4';
-    	return;}
-
-    $mail->prepForOutbound();
-    $hasRecipients = false;
-
-    if (!empty($itemail)){
-        if($hasRecipients){
-            $mail->AddBCC($itemail);
-        }else{
-            $mail->AddAddress($itemail);
-        }
-        $hasRecipients = true;
-    }
-    $success = false;
-    if($hasRecipients){
-    	$success = @$mail->Send();
-    }
-
-    //now create email
-    if($success){
-
-        $emailObj->team_id = 1;
-        $emailObj->to_addrs= '';
-        $emailObj->type= 'archived';
-        $emailObj->deleted = '0';
-        $emailObj->name = $mail->Subject ;
-        $emailObj->description = $mail->Body;
-        $emailObj->description_html =null;
-        $emailObj->from_addr = $mail->From;
-        $emailObj->parent_type = 'User';
-        $emailObj->date_sent =TimeDate::getInstance()->nowDb();
-        $emailObj->modified_user_id = '1';
-        $emailObj->created_by = '1';
-        $emailObj->status='sent';
-        $retId = $emailObj->save();
+    if ($result['status'] == true)
+    {
         echo '1';
-        if (!isset($_POST['link'])){
-            $usr->setNewPassword($password, '1');
-        }
-    }else{
+    } else {
     	$new_pwd='4';
     	if ($current_user->is_admin){
     		$email_errors=$mod_strings['ERR_EMAIL_NOT_SENT_ADMIN'];
-    		if ($mail->Mailer == 'smtp')
-    			$email_errors.="\n-".$mod_strings['ERR_SMTP_URL_SMTP_PORT'];
-    		if ($mail->SMTPAuth)
-    		 	$email_errors.="\n-".$mod_strings['ERR_SMTP_USERNAME_SMTP_PASSWORD'];
     		$email_errors.="\n-".$mod_strings['ERR_RECIPIENT_EMAIL'];
     		$email_errors.="\n-".$mod_strings['ERR_SERVER_STATUS'];
     		echo $email_errors;
@@ -266,3 +186,5 @@ if (isset($_POST['link']) && $_POST['link'] == '1'){
     		echo $mod_strings['LBL_EMAIL_NOT_SENT'];
     }
     return;
+
+?>
diff --git a/modules/Users/LoggedOut.php b/modules/Users/LoggedOut.php
new file mode 100644
index 00000000..ed1997ba
--- /dev/null
+++ b/modules/Users/LoggedOut.php
@@ -0,0 +1,53 @@
+<?php
+if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+if (isset($_SESSION['authenticated_user_id']))
+{
+    ob_clean();
+    header('Location: ' . $GLOBALS['app']->getLoginRedirect());
+    sugar_cleanup(true);
+    return;
+}
+
+// display the logged out screen
+$smarty = new Sugar_Smarty();
+$smarty->assign(array(
+    'LOGIN_URL'  => 'index.php?action=Login&module=Users',
+    'STYLESHEET' => getJSPath('modules/Users/login.css'),
+));
+$smarty->display('modules/Users/LoggedOut.tpl');
diff --git a/modules/Users/LoggedOut.tpl b/modules/Users/LoggedOut.tpl
new file mode 100644
index 00000000..9e3a177a
--- /dev/null
+++ b/modules/Users/LoggedOut.tpl
@@ -0,0 +1,55 @@
+{*
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+*}
+<link rel="stylesheet" type="text/css" media="all" href="{$STYLESHEET}">
+<table cellpadding="0" align="center" width="100%" cellspacing="0" border="0" style="margin-top: 100px;">
+    <tr>
+        <td align="center">
+            <div class="loginBoxShadow" style="width: 460px;">
+                <div class="loginBox last">
+                    <table cellpadding="0" cellspacing="0" border="0" align="center" width="100%">
+                        <tr>
+                            <td align="center">
+                                <b>{sugar_translate module="Users" label="LBL_LOGGED_OUT_1"}<a href="{$LOGIN_URL}">{sugar_translate module="Users" label="LBL_LOGGED_OUT_2"}</a>{sugar_translate module="Users" label="LBL_LOGGED_OUT_3"}</b>
+                            </td>
+                        </tr>
+                    </table>
+                </div>
+            </div>
+        </td>
+    </tr>
+</table>
diff --git a/modules/Users/Login.php b/modules/Users/Login.php
index d43cc373..417c20f2 100644
--- a/modules/Users/Login.php
+++ b/modules/Users/Login.php
@@ -42,15 +42,9 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  * All Rights Reserved.
  * Contributor(s): ______________________________________..
  ********************************************************************************/
-if (isset($_SESSION['authenticated_user_id']))
-{
-    ob_clean();
-    // fixing bug #46837: Previosly links/URLs to records in Sugar from MSO Excel/Word were referred to the home screen and not the record
-    // It used to appear when default browser was not MS IE
-    header("Location: ".$GLOBALS['app']->getLoginRedirect());
-    sugar_cleanup(true);
-    return;
-}
+/** @var AuthenticationController $authController */
+$authController->authController->pre_login();
+
 global $current_language, $mod_strings, $app_strings;
 if(isset($_REQUEST['login_language'])){
     $lang = $_REQUEST['login_language'];
@@ -214,4 +208,4 @@ if ( !empty($logindisplay) )
 		</script>";
 	}
 
-$sugar_smarty->display('modules/Users/login.tpl'); ?>
\ No newline at end of file
+$sugar_smarty->display('modules/Users/login.tpl'); ?>
diff --git a/modules/Users/Logout.php b/modules/Users/Logout.php
index 58b79cdd..bd9b13db 100644
--- a/modules/Users/Logout.php
+++ b/modules/Users/Logout.php
@@ -63,8 +63,6 @@ session_destroy();
 
 LogicHook::initialize();
 $GLOBALS['logic_hook']->call_custom_logic('Users', 'after_logout');
-// go to the login screen.
-header("Location: index.php?action=Login&module=Users");
-sugar_cleanup(true);
 
-?>
+/** @var AuthenticationController $authController */
+$authController->authController->logout();
diff --git a/modules/Users/Save.php b/modules/Users/Save.php
index 17dcd546..db172d3d 100644
--- a/modules/Users/Save.php
+++ b/modules/Users/Save.php
@@ -43,7 +43,7 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
  * Contributor(s): ______________________________________..
  ********************************************************************************/
 
-
+require_once('include/SugarFields/SugarFieldHandler.php');
 require_once('modules/MySettings/TabController.php');
 
 $display_tabs_def = isset($_REQUEST['display_tabs_def']) ? urldecode($_REQUEST['display_tabs_def']) : '';
@@ -101,10 +101,20 @@ if(!$current_user->is_admin  && !$GLOBALS['current_user']->isAdminForModule('Use
 
 
     // Populate the custom fields
-    foreach ($focus->field_defs as $fieldName => $field ) {
-        if ( isset($field['source']) && $field['source'] == 'custom_fields' ) {
-            if ( isset($_POST[$fieldName]) ) {
-                $focus->$field = $_POST[$fieldName];
+    $sfh = new SugarFieldHandler();
+    foreach ($focus->field_defs as $fieldName => $field)
+    {
+        if (isset($field['source']) && $field['source'] == 'custom_fields')
+        {
+            $type = !empty($field['custom_type']) ? $field['custom_type'] : $field['type'];
+            $sf = $sfh->getSugarField($type);
+            if ($sf != null)
+            {
+                $sf->save($focus, $_POST, $fieldName, $field, '');
+            }
+            else
+            {
+                $GLOBALS['log']->fatal("Field '$fieldName' does not have a SugarField handler");
             }
         }
     }
@@ -144,22 +154,34 @@ if(!$current_user->is_admin  && !$GLOBALS['current_user']->isAdminForModule('Use
 	// if the user saved is a Regular User
 	if(!$focus->is_group && !$focus->portal_only){
 
-		foreach($focus->column_fields as $field)
-		{
-			if(isset($_POST[$field]))
-			{
-				$value = $_POST[$field];
-				$focus->$field = $value;
-			}
-		}
-		foreach($focus->additional_column_fields as $field)
-		{
-			if(isset($_POST[$field]))
-			{
-				$value = $_POST[$field];
-				$focus->$field = $value;
-			}
-		}
+        foreach ($focus->column_fields as $fieldName)
+        {
+            $field = $focus->field_defs[$fieldName];
+            $type = !empty($field['custom_type']) ? $field['custom_type'] : $field['type'];
+            $sf = $sfh->getSugarField($type);
+            if ($sf != null)
+            {
+                $sf->save($focus, $_POST, $fieldName, $field, '');
+            }
+            else
+            {
+                $GLOBALS['log']->fatal("Field '$fieldName' does not have a SugarField handler");
+            }
+        }
+        foreach ($focus->additional_column_fields as $fieldName)
+        {
+            $field = $focus->field_defs[$fieldName];
+            $type = !empty($field['custom_type']) ? $field['custom_type'] : $field['type'];
+            $sf = $sfh->getSugarField($type);
+            if ($sf != null)
+            {
+                $sf->save($focus, $_POST, $fieldName, $field, '');
+            }
+            else
+            {
+                $GLOBALS['log']->fatal("Field '$fieldName' does not have a SugarField handler");
+            }
+        }
 
 		$focus->is_group=0;
 		$focus->portal_only=0;
diff --git a/modules/Users/User.php b/modules/Users/User.php
index 9e2137e9..1073a69f 100644
--- a/modules/Users/User.php
+++ b/modules/Users/User.php
@@ -608,7 +608,7 @@ class User extends Person {
 
 		select id from users where id in ( SELECT  er.bean_id AS id FROM email_addr_bean_rel er,
 			email_addresses ea WHERE ea.id = er.email_address_id
-		    AND ea.deleted = 0 AND er.deleted = 0 AND er.bean_module = 'Users' AND email_address_caps IN ('{$email}') )
+		    AND ea.deleted = 0 AND er.deleted = 0 AND er.bean_module = 'Users' AND email_address_caps IN ('{$email1}') )
 EOQ;
 
 
diff --git a/modules/Users/UserViewHelper.php b/modules/Users/UserViewHelper.php
index 2eb15948..85aa9e33 100644
--- a/modules/Users/UserViewHelper.php
+++ b/modules/Users/UserViewHelper.php
@@ -442,9 +442,19 @@ class UserViewHelper {
         } else {
             $publish_url .= '&user_name='.$this->bean->user_name;
         }
+
+        $ical_url = $sugar_config['site_url'].'/ical_server.php?type=ics&key=<span id="ical_pub_key_span">'.$this->bean->getPreference('calendar_publish_key' ) . '</span>';
+        if (! empty($this->bean->email1))
+        {
+            $ical_url .= '&email='.$this->bean->email1;
+        } else
+        {
+            $ical_url .= '&user_name='.$this->bean->user_name;
+        }
+
         $this->ss->assign("CALENDAR_PUBLISH_URL", $publish_url);
         $this->ss->assign("CALENDAR_SEARCH_URL", $sugar_config['site_url'].'/vcal_server.php/type=vfb&email=%NAME%@%SERVER%');
-        $this->ss->assign("CALENDAR_ICAL_URL", $sugar_config['site_url'].'/ical_server.php?type=ics&key=%MYSECRETKEY%&user_name=%MYUSERNAME%');
+        $this->ss->assign("CALENDAR_ICAL_URL", $ical_url);
 
         $this->ss->assign("SETTINGS_URL", $sugar_config['site_url']);
 
diff --git a/modules/Users/authentication/AuthenticationController.php b/modules/Users/authentication/AuthenticationController.php
index 3f9f6461..e9c50cda 100644
--- a/modules/Users/authentication/AuthenticationController.php
+++ b/modules/Users/authentication/AuthenticationController.php
@@ -37,26 +37,31 @@ if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 
 
-class AuthenticationController 
+class AuthenticationController
 {
 	public $loggedIn = false; //if a user has attempted to login
 	public $authenticated = false;
 	public $loginSuccess = false;// if a user has successfully logged in
-	
+
 	protected static $authcontrollerinstance = null;
 
+    /**
+     * @var SugarAuthenticate
+     */
+    public $authController;
+
 	/**
 	 * Creates an instance of the authentication controller and loads it
 	 *
 	 * @param STRING $type - the authentication Controller - default to SugarAuthenticate
 	 * @return AuthenticationController -
 	 */
-	public function __construct($type = 'SugarAuthenticate') 
+	public function __construct($type = 'SugarAuthenticate')
 	{
 	    if ($type == 'SugarAuthenticate' && !empty($GLOBALS['system_config']->settings['system_ldap_enabled']) && empty($_SESSION['sugar_user'])){
 			$type = 'LDAPAuthenticate';
         }
-	    
+
         // check in custom dir first, in case someone want's to override an auth controller
 		if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
             require_once('custom/modules/Users/authentication/'.$type.'/' . $type . '.php');
@@ -68,7 +73,6 @@ class AuthenticationController
         }
 
         $this->authController = new $type();
-        $this->authController->pre_login();
 	}
 
 
@@ -83,7 +87,7 @@ class AuthenticationController
 		if (empty(self::$authcontrollerinstance)) {
 			self::$authcontrollerinstance = new AuthenticationController($type);
 		}
-		
+
 		return self::$authcontrollerinstance;
 	}
 
@@ -95,7 +99,7 @@ class AuthenticationController
 	 * @param array $PARAMS
 	 * @return boolean true if the user successfully logs in or false otherwise.
 	 */
-	public function login($username, $password, $PARAMS = array()) 
+	public function login($username, $password, $PARAMS = array())
 	{
 		//kbrill bug #13225
 		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
@@ -114,7 +118,7 @@ class AuthenticationController
 			loginLicense();
 			if(!empty($GLOBALS['login_error'])){
 				unset($_SESSION['authenticated_user_id']);
-				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt');
+				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
 				$this->loginSuccess = false;
 				return false;
 			}
@@ -163,7 +167,7 @@ class AuthenticationController
 	 *
 	 * @return booelan
 	 */
-	public function sessionAuthenticate() 
+	public function sessionAuthenticate()
 	{
 		if(!$this->authenticated){
 			$this->authenticated = $this->authController->sessionAuthenticate();
diff --git a/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php b/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php
index 60697d1d..3d9467a1 100644
--- a/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php
+++ b/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticate.php
@@ -63,16 +63,29 @@ class SAMLAuthenticate extends SugarAuthenticate {
     /**
      * pre_login
      * 
-     * Override the pre_login function from SugarAuthenticate so that we can set a default user_name/user_password $_REQUEST values
-     * if none are supplied
+     * Override the pre_login function from SugarAuthenticate so that user is
+     * redirected to SAML entry point if other is not specified
      */
     function pre_login()
     {
-        if(isset($_REQUEST['action']) && $_REQUEST['action'] == 'Authenticate')
+        parent::pre_login();
+
+        if (empty($_REQUEST['no_saml']))
         {
-            if(empty($_REQUEST['user_name']))$_REQUEST['user_name'] = 'onelogin';
-            if(empty($_REQUEST['user_password']))$_REQUEST['user_password'] = 'onelogin';
+            SugarApplication::redirect('?entryPoint=SAML');
         }
     }
 
+    /**
+     * Called when a user requests to logout
+     *
+     * Override default behavior. Redirect user to special "Logged Out" page in
+     * order to prevent automatic logging in.
+     */
+    public function logout() {
+        session_destroy();
+        ob_clean();
+        header('Location: index.php?module=Users&action=LoggedOut');
+        sugar_cleanup(true);
+    }
 }
diff --git a/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php b/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php
index 25b0f296..4076d507 100644
--- a/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php
+++ b/modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php
@@ -68,38 +68,28 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
 		
 		$GLOBALS['log']->debug('have saml data.'); // JMH
 		// Look for custom versions of settings.php if it exists
-        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
 
-		require('modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php');
+		require_once('modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php');
+        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
 
-		$samlresponse = new SamlResponse(get_saml_settings(), $_POST['SAMLResponse']);
+        $samlresponse = new SamlResponse($settings, $_POST['SAMLResponse']);
 
 		if ($samlresponse->is_valid()){
 			$GLOBALS['log']->debug('response is valid');
-			$settings = get_saml_settings();
 			$customFields = $this->getAdditionalFieldsToSelect($samlresponse, $settings);
 			$GLOBALS['log']->debug('got this many custom fields:' . count($customFields));
-			$xmlDoc = new DOMDocument();
-			$xmlDoc->loadXML(base64_decode($_POST['SAMLResponse']));
-			$xpath = new DOMXpath($xmlDoc);
-			$query = $settings->saml_settings['check']['user_name'];
-			$entries = $xpath->query($query);
-			$nameId = $entries->item(0)->nodeValue;
-	
-			$sql = "SELECT id, status $customFields FROM users WHERE " . $settings->id . "='" . $nameId . "' AND deleted = 0";
-			$dbresult = $GLOBALS['db']->query("SELECT id, status $customFields FROM users WHERE " . $settings->id . "='" . $nameId . "' AND deleted = 0");
-	
-			$GLOBALS['log']->debug("sql: {$sql}"); // JMH
-					
-			$GLOBALS['log']->debug('queried the db'); // JMH
+
+            $id = $this->get_user_id($samlresponse, $settings);
+            $user = $this->fetch_user($id, $settings->id);
+
 			//user already exists use this one
-			if($row = $GLOBALS['db']->fetchByAssoc($dbresult)){
+			if ($user->id){
 				$GLOBALS['log']->debug('have db results'); // JMH
-				if($row['status'] != 'Inactive')
+				if($user->status != 'Inactive')
 				{
 					$GLOBALS['log']->debug('have current user'); // JMH
-					$this->updateCustomFields($row, $_POST['SAMLResponse'], $settings);
-					return $row['id'];
+					$this->updateCustomFields($user, $samlresponse, $settings);
+					return $user->id;
 				}
 				else
 				{
@@ -109,9 +99,11 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
 			}
 			else
 			{
+                $xmlDoc = $samlresponse->xml;
+                $xpath = new DOMXpath($xmlDoc);
                 if (isset($settings->customCreateFunction))
                 {
-                    call_user_func($settings->customCreateFunction, $this, $samlresponse->get_nameid(), $xpath, $settings);
+                    return call_user_func($settings->customCreateFunction, $this, $samlresponse->get_nameid(), $xpath, $settings);
                 } else {
                     return $this->createUser($samlresponse->get_nameid(), $xpath, $settings);
                 }
@@ -130,14 +122,14 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
 	* by that xpath. If the value of the node does not equal the value in our
 	* records, update our records to match the value from the xml.
 	*
-	* @param hash $dbData - data for this user from our db.
-	* @param string $xmlSAMLAssertion - xml text, a valid saml assertion.
+	* @param User $user - user fetched from our db.
+	* @param SamlResponse $samlresponse - saml provider response.
 	* @param SamlSettings $settings - our settings object.
 	* @return int - 0 = no action taken, 1 = user record saved, -1 = no update.
 	*
 	* Contributed by Mike Andersen, SugarCRM.
 	**/
-	function updateCustomFields($dbData, $xmlSAMLAssertion, $settings)
+	function updateCustomFields($user, $samlresponse, $settings)
 	{
 		$customFields = $this->getCustomFields($settings, 'update');
 
@@ -147,12 +139,9 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
 			return 0;
 		}
 		
-		$user = new User();
-		$user->retrieve($dbData['id']);
 		$GLOBALS['log']->debug("updateCF()... userid={$user->id}"); // JMH
 		
-		$xmlDoc = new DOMDocument();
-		$xmlDoc->loadXML(base64_decode($xmlSAMLAssertion));
+		$xmlDoc = $samlresponse->xml;
 		$xpath = new DOMXpath($xmlDoc);
 		$GLOBALS['log']->debug("Created xpath object."); // JMH
 		
@@ -161,13 +150,13 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
 		foreach ($customFields as $field)
 		{
 			$GLOBALS['log']->debug("Top of fields loop with $field."); // JMH
-			if (!array_key_exists($field, $dbData))
+			if (!property_exists($user, $field))
 			{
-				$GLOBALS['log']->debug("$field is not in \$dbData. \n\$dbData=" . var_export($dbData, TRUE)); // JMH
+				$GLOBALS['log']->debug("$field is not a user field. \nThe fields are: " . var_export(array_keys(get_object_vars($user)), TRUE)); // JMH
 				// custom field not listed in db query results!
 				continue;
 			}
-			$customFieldValue = $dbData[$field];
+			$customFieldValue = $user->$field;
 			
 			$xmlNodes = $xpath->query($settings->saml_settings['update'][$field]);
 			if ($xmlNodes === false)
@@ -312,5 +301,89 @@ class SAMLAuthenticateUser extends SugarAuthenticateUser{
   	$GLOBALS['log']->debug("New user id is " . $user->id);
 		return $user->id;
 	}
+
+    /**
+     * Retrieves user ID from SamlResponse according to SamlSettings
+     *
+     * @param SamlResponse $samlresponse
+     * @param SamlSettings $settings
+     * @return string
+     */
+    protected function get_user_id($samlresponse, $settings)
+    {
+        if (isset($settings->saml_settings['check']['user_name']))
+        {
+            $xmlDoc = $samlresponse->xml;
+            $xpath = new DOMXpath($xmlDoc);
+            $query = $settings->saml_settings['check']['user_name'];
+            $entries = $xpath->query($query);
+            $name_id = $entries->item(0)->nodeValue;
+        }
+        else
+        {
+            $name_id = $samlresponse->get_nameid();
+        }
+
+        return $name_id;
+    }
+
+    /**
+     * Fetches user by provided ID and field name
+     *
+     * @param mixed $id
+     * @param string $field
+     * @return User
+     */
+    protected function fetch_user($id, $field = null)
+    {
+        $user = new User();
+
+        if (null !== $field)
+        {
+            switch ($field)
+            {
+                case 'user_name':
+                    // fetch user id by username
+                    $sql = 'select id from users where user_name = '
+                        . $user->db->quoted($id) . ' and deleted = 0';
+                    $data = $user->db->fetchOne($sql);
+                    if (is_array($data)) {
+                        $id = reset($data);
+                        $user->retrieve($id);
+                    }
+                    break;
+                case 'id':
+                    $user->retrieve($id);
+                    break;
+                default:
+                    // nothing else is implemented
+                    break;
+            }
+        }
+        else
+        {
+            // use email as a default primary key (onelogin.com provides it)
+            $user->retrieve_by_email_address($id);
+        }
+
+        return $user;
+    }
+
+    /**
+     * This is called when a user logs in
+     *
+     * @param string $name
+     * @param string $password
+     * @param boolean $fallback - is this authentication a fallback from a failed authentication
+     * @param array $PARAMS
+     * @return boolean
+     */
+    public function loadUserOnLogin($name, $password, $fallback = false, $PARAMS = array())
+    {
+        // provide dummy login and password to parent class so that authentication
+        // process could go on
+        return parent::loadUserOnLogin('onelogin', 'onelogin', $fallback, $PARAMS);
+    }
 }
+
 ?>
diff --git a/modules/Users/authentication/SAMLAuthenticate/index.php b/modules/Users/authentication/SAMLAuthenticate/index.php
index eb6a81fa..b592b30a 100644
--- a/modules/Users/authentication/SAMLAuthenticate/index.php
+++ b/modules/Users/authentication/SAMLAuthenticate/index.php
@@ -25,10 +25,10 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ********************************************************************************/
+require_once('modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php');
 require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
-require('modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php');
-  
-$authrequest = new SamlAuthRequest(get_saml_settings());
+
+$authrequest = new SamlAuthRequest($settings);
 $url = $authrequest->create();
 
-header("Location: $url");
\ No newline at end of file
+header("Location: $url");
diff --git a/modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php b/modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php
index 2d468a04..76073e7a 100644
--- a/modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php
+++ b/modules/Users/authentication/SAMLAuthenticate/lib/xmlseclibs/xmlseclibs.php
@@ -323,7 +323,11 @@ class XMLSecurityKey {
         }
         if ($this->cryptParams['library'] == 'openssl') {
             if ($this->cryptParams['type'] == 'public') {
-                $this->key = openssl_get_publickey($this->key);
+                // Disable this part due to openssl bug on some systems
+                // that think public key is private key. Certificate
+                // should still serve as key for verification purposes
+                // By smalyshev 1 May 2012
+                 // $this->key = openssl_get_publickey($this->key);
             } else {
                 $this->key = openssl_get_privatekey($this->key, $this->passphrase);
             }
@@ -520,7 +524,7 @@ class XMLSecurityKey {
     public function serializeKey($parent) {
 
     }
-    
+
 
 
     /**
@@ -534,7 +538,7 @@ class XMLSecurityKey {
     public function getX509Certificate() {
         return $this->x509Certificate;
     }
-    
+
 }
 
 class XMLSecurityDSig {
@@ -885,10 +889,10 @@ class XMLSecurityDSig {
         if ($nodeset->length == 0) {
             throw new Exception("Reference nodes not found");
         }
-        
+
         /* Initialize/reset the list of validated nodes. */
         $this->validatedNodes = array();
-        
+
         foreach ($nodeset AS $refNode) {
             if (! $this->processRefNode($refNode)) {
                 /* Clear the list of validated nodes. */
@@ -943,8 +947,8 @@ class XMLSecurityDSig {
             foreach ($arTransforms AS $transform) {
                 $transNode = $this->createNewSignNode('Transform');
                 $transNodes->appendChild($transNode);
-                if (is_array($transform) && 
-                    (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) && 
+                if (is_array($transform) &&
+                    (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
                     (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
                     $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
                     $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
@@ -1200,7 +1204,7 @@ class XMLSecurityDSig {
             self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath);
          }
     }
-    
+
     /* This function retrieves an associative array of the validated nodes.
      *
      * The array will contain the id of the referenced node as the key and the node itself
diff --git a/modules/Users/authentication/SAMLAuthenticate/settings.php b/modules/Users/authentication/SAMLAuthenticate/settings.php
index 24d6f8cd..62baa1d8 100644
--- a/modules/Users/authentication/SAMLAuthenticate/settings.php
+++ b/modules/Users/authentication/SAMLAuthenticate/settings.php
@@ -26,30 +26,18 @@ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  ********************************************************************************/
   
-/**
- * Return a SamlSettings object with user settings.
- *
- * @return SamlSettings object
- */
-function get_saml_settings()
-{
-    // this function should be modified to return the SAML settings for the current user
+$settings                           = new SamlSettings();
+// when using Service Provider Initiated SSO (starting at index.php), this URL asks the IdP to authenticate the user. 
+$settings->idp_sso_target_url       = isset($GLOBALS['sugar_config']['SAML_loginurl']) ? $GLOBALS['sugar_config']['SAML_loginurl'] : '';
 
-    $settings                           = new SamlSettings();
-    // when using Service Provider Initiated SSO (starting at index.php), this URL asks the IdP to authenticate the user. 
-    $settings->idp_sso_target_url       = $GLOBALS['sugar_config']['SAML_loginurl'];
-    
-    // the certificate for the users account in the IdP
-    $settings->x509certificate          = $GLOBALS['sugar_config']['SAML_X509Cert'];
-    
-    // The URL where to the SAML Response/SAML Assertion will be posted
-    $settings->assertion_consumer_service_url = $GLOBALS['sugar_config']['site_url']. "/index.php?module=Users&action=Authenticate";
+// the certificate for the users account in the IdP
+$settings->x509certificate          = isset($GLOBALS['sugar_config']['SAML_X509Cert']) ? $GLOBALS['sugar_config']['SAML_X509Cert'] : '';
 
-    // Name of this application
-    $settings->issuer                         = "php-saml";
+// The URL where to the SAML Response/SAML Assertion will be posted
+$settings->assertion_consumer_service_url = $GLOBALS['sugar_config']['site_url']. "/index.php?module=Users&action=Authenticate";
 
-    // Tells the IdP to return the email address of the current user
-    $settings->name_identifier_format         = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
+// Name of this application
+$settings->issuer                         = "php-saml";
 
-    return $settings;
-}
+// Tells the IdP to return the email address of the current user
+$settings->name_identifier_format         = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
diff --git a/modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php b/modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php
index f6478c62..698bb743 100644
--- a/modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php
+++ b/modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php
@@ -354,6 +354,13 @@ class SugarAuthenticate{
      */
     function pre_login()
     {
+        if (isset($_SESSION['authenticated_user_id']))
+        {
+            ob_clean();
+            // fixing bug #46837: Previosly links/URLs to records in Sugar from MSO Excel/Word were referred to the home screen and not the record
+            // It used to appear when default browser was not MS IE
+            header("Location: ".$GLOBALS['app']->getLoginRedirect());
+            sugar_cleanup(true);
+        }
     }
-
 }
diff --git a/modules/Users/language/en_us.lang.php b/modules/Users/language/en_us.lang.php
index 327da7f9..bc4f3156 100644
--- a/modules/Users/language/en_us.lang.php
+++ b/modules/Users/language/en_us.lang.php
@@ -234,6 +234,9 @@ $mod_strings = array (
    	'LBL_LOGIN_LOGIN_TIME_SECONDS'      => 'sec.',
     'LBL_LOGIN_ADMIN_CALL'              => 'Please contact the system administrator.',
 	// END LOGIN PAGE STRINGS
+    'LBL_LOGGED_OUT_1' => 'You have been logged out. To login again please click ',
+    'LBL_LOGGED_OUT_2' => 'here',
+    'LBL_LOGGED_OUT_3' => '.',
 	'LBL_MAIL_FROMADDRESS'				=> 'Reply-to address',
 	'LBL_MAIL_FROMNAME'					=> 'Reply-to name',
 	'LBL_MAIL_OPTIONS_TITLE'			=> 'Email Settings',
diff --git a/modules/Users/tpls/EditViewFooter.tpl b/modules/Users/tpls/EditViewFooter.tpl
index f938e0fc..f9094f5a 100644
--- a/modules/Users/tpls/EditViewFooter.tpl
+++ b/modules/Users/tpls/EditViewFooter.tpl
@@ -412,9 +412,11 @@ function Admin_check(){
 $(document).ready(function() {
     $('#calendar_publish_key').keypress(function(){
         $('#cal_pub_key_span').html( $(this).val());
+        $('#ical_pub_key_span').html( $(this).val());
     });
     $('#calendar_publish_key').change(function(){
-            $('#cal_pub_key_span').html( $(this).val());
+        $('#cal_pub_key_span').html( $(this).val());
+        $('#ical_pub_key_span').html( $(this).val());
     });
 });
 {/literal}
diff --git a/modules/vCals/vCal.php b/modules/vCals/vCal.php
index d464ef86..7147b4ff 100644
--- a/modules/vCals/vCal.php
+++ b/modules/vCals/vCal.php
@@ -166,8 +166,12 @@ class vCal extends SugarBean {
            $email = $user_focus->email1;
 
            // get current date for the user
-           $now_date_time = $timedate->getNow(true);
-
+            if (!empty($_REQUEST['datestart'])) {
+                $now_date_time = SugarDateTime::createFromFormat($GLOBALS['timedate']->get_date_time_format(),$_REQUEST['datestart']." 00:00");
+                $cached=false;
+            } else {
+                $now_date_time = $timedate->getNow(true);
+            }
            // get start date ( 1 day ago )
            $start_date_time = $now_date_time->get("yesterday");
 
diff --git a/service/core/SugarWebServiceImpl.php b/service/core/SugarWebServiceImpl.php
index 13cd4307..80e9ffb5 100644
--- a/service/core/SugarWebServiceImpl.php
+++ b/service/core/SugarWebServiceImpl.php
@@ -1132,6 +1132,12 @@ function get_entries_count($session, $module_name, $query, $deleted) {
 	$sql = 'SELECT COUNT(*) result_count FROM ' . $seed->table_name . ' ';
 
 
+    if (isset($seed->custom_fields))
+    {
+        $customJoin = $seed->custom_fields->getJOIN();
+        $sql .= $customJoin ? $customJoin['join'] : '';
+    }
+
 	// build WHERE clauses, if any
 	$where_clauses = array();
 	if (!empty($query)) {
diff --git a/service/example/example.html b/service/example/example.html
index a3ca2f58..8e48cdf5 100644
--- a/service/example/example.html
+++ b/service/example/example.html
@@ -306,7 +306,7 @@ SugarRest.buildColumnDefs = function(){
   };
 
    SugarRest.callLink = function(elCell, oRecord, oColumn, oData) {
-            elCell.innerHTML = "<a href='callto://" + oData+ "'>"+ oData+ "</a>";
+            elCell.innerHTML = "<a href='callto:" + oData+ "'>"+ oData+ "</a>";
   };
 
    SugarRest.checkboxField = function(elCell, oRecord, oColumn, oData) {
diff --git a/service/v4/SugarWebServiceImplv4.php b/service/v4/SugarWebServiceImplv4.php
index b84448ee..e02bd589 100644
--- a/service/v4/SugarWebServiceImplv4.php
+++ b/service/v4/SugarWebServiceImplv4.php
@@ -285,6 +285,9 @@ class SugarWebServiceImplv4 extends SugarWebServiceImplv3_1 {
         if($offset == '' || $offset == -1){
             $offset = 0;
         } // if
+        if($deleted){
+            $deleted = -1;
+        }
         if($using_cp){
             $response = $seed->retrieveTargetList($query, $select_fields, $offset,-1,-1,$deleted);
         }else
diff --git a/soap/SoapPortalHelper.php b/soap/SoapPortalHelper.php
index a7e003fb..c1743a11 100644
--- a/soap/SoapPortalHelper.php
+++ b/soap/SoapPortalHelper.php
@@ -448,7 +448,7 @@ function portal_get_entry_list_limited($session, $module_name,$where, $order_by,
     return array('result_count'=>sizeof($output_list), 'next_offset'=>0,'field_list'=>$field_list, 'entry_list'=>$output_list, 'error'=>$error->get_soap_array());
 }
 
-$invalid_contact_fields = array('portal_name'=>1, 'portal_password'=>1, 'portal_active'=>1);
+$invalid_contact_fields = array('portal_password'=>1, 'portal_active'=>1);
 $valid_modules_for_contact = array('Contacts'=>1, 'Cases'=>1, 'Notes'=>1, 'Bugs'=>1, 'Accounts'=>1, 'Leads'=>1, 'KBDocuments'=>1);
 
 
diff --git a/soap/SoapPortalUsers.php b/soap/SoapPortalUsers.php
index 44190565..430d802c 100644
--- a/soap/SoapPortalUsers.php
+++ b/soap/SoapPortalUsers.php
@@ -231,7 +231,7 @@ function portal_get_entry_list_filter($session, $module_name, $order_by, $select
     }else if($module_name == 'Contacts'){
         $sugar = new Contact();
     }else if($module_name == 'Accounts'){
-        $sugar = new Account(); 
+        $sugar = new Account();
     } else if($module_name == 'Bugs'){
         $sugar = new Bug();
     } else if($module_name == 'KBDocuments' || $module_name == 'FAQ') {
@@ -293,15 +293,15 @@ $server->register(
 function portal_get_entry($session, $module_name, $id,$select_fields ){
     global  $beanList, $beanFiles;
     $error = new SoapError();
-    
+
     if(!portal_validate_authenticated($session)){
         $error->set_error('invalid_session');
         return array('result_count'=>-1, 'entry_list'=>array(), 'error'=>$error->get_soap_array());
     }
-    
+
     //set the working module
     set_module_in(array('list'=>array($id=>$id), 'in'=>'('.$id.')'), $module_name);
-    
+
     if($_SESSION['type'] == 'lead'){
         $error->set_error('no_access');
         return array('result_count'=>-1, 'entry_list'=>array(), 'error'=>$error->get_soap_array());
@@ -483,7 +483,7 @@ function portal_remove_note_attachment($session, $id)
         $error->set_error('no_access');
         return array('result_count'=>-1, 'entry_list'=>array(), 'error'=>$error->get_soap_array());
     }
-    
+
     $focus = new Note();
     $focus->retrieve($id);
     $result = $focus->deleteAttachment();
@@ -510,7 +510,7 @@ function portal_get_note_attachment($session,$id)
         return array('result_count'=>-1, 'entry_list'=>array(), 'error'=>$error->get_soap_array());
     }
     $current_user = $seed_user;
-    
+
     $note = new Note();
     $note->retrieve($id);
     require_once('modules/Notes/NoteSoap.php');
diff --git a/soap/SoapSugarUsers.php b/soap/SoapSugarUsers.php
index e0397a92..0bc40048 100644
--- a/soap/SoapSugarUsers.php
+++ b/soap/SoapSugarUsers.php
@@ -1194,7 +1194,7 @@ function set_relationship($session, $set_relationship_value){
 		$error->set_error('invalid_login');
 		return $error->get_soap_array();
 	}
-	return handle_set_relationship($set_relationship_value);
+	return handle_set_relationship($set_relationship_value, $session);
 }
 
 $server->register(
@@ -1223,7 +1223,7 @@ function set_relationships($session, $set_relationship_list){
 	$count = 0;
 	$failed = 0;
 	foreach($set_relationship_list as $set_relationship_value){
-		$reter = handle_set_relationship($set_relationship_value);
+		$reter = handle_set_relationship($set_relationship_value, $session);
 		if($reter['number'] == 0){
 			$count++;
 		}else{
@@ -1246,7 +1246,7 @@ function set_relationships($session, $set_relationship_list){
  *      'module2_id' -- The ID of the bean in the specified module
  * @return Empty error on success, Error on failure
  */
-function handle_set_relationship($set_relationship_value)
+function handle_set_relationship($set_relationship_value, $session='')
 {
     global  $beanList, $beanFiles;
     $error = new SoapError();
@@ -1363,7 +1363,17 @@ function handle_set_relationship($set_relationship_value)
     	$key = strtolower($module2);
     	$mod->load_relationship($key);
     	$mod->$key->add($module2_id);
-    }else{
+    }
+    else if ($module1 == 'Contacts' && ($module2 == 'Notes' || $module2 == 'Calls' || $module2 == 'Meetings' || $module2 == 'Tasks') && !empty($session)){
+        $mod->$key = $module2_id;
+        $mod->save_relationship_changes(false);
+        if (!empty($mod->account_id)) {
+            // when setting a relationship from a Contact to these activities, if the Contacts is related to an Account,
+            // we want to associate that Account to the activity as well
+            $ret = set_relationship($session, array('module1'=>'Accounts', 'module1_id'=>$mod->account_id, 'module2'=>$module2, 'module2_id'=>$module2_id));
+        }
+    }
+    else{
     	$mod->$key = $module2_id;
     	$mod->save_relationship_changes(false);
     }
@@ -1973,6 +1983,11 @@ function get_entries_count($session, $module_name, $query, $deleted) {
 	$sql = 'SELECT COUNT(*) result_count FROM ' . $seed->table_name . ' ';
 
 
+    if (isset($seed->custom_fields)) {
+        $customJoin = $seed->custom_fields->getJOIN();
+        $sql .= $customJoin ? $customJoin['join'] : '';
+    }
+
 	// build WHERE clauses, if any
 	$where_clauses = array();
 	if (!empty($query)) {
@@ -2245,4 +2260,3 @@ function handle_set_entries($module_name, $name_value_lists, $select_fields = FA
 	}
 }
 
-?>
diff --git a/sugar_version.php b/sugar_version.php
index cef5c2a8..0607f433 100644
--- a/sugar_version.php
+++ b/sugar_version.php
@@ -38,10 +38,10 @@
 
 
 
-$sugar_version      = '6.5.0';
-$sugar_db_version   = '6.5.0';
+$sugar_version      = '6.5.1';
+$sugar_db_version   = '6.5.1';
 $sugar_flavor       = 'CE';
-$sugar_build		= '8338';
-$sugar_timestamp    = '2012-06-06 01:09pm';
+$sugar_build		= '8408';
+$sugar_timestamp    = '2012-07-18 11:22am';
 
 ?>
diff --git a/tests/PHPUnit/File/Iterator/Autoload.php b/tests/PHPUnit/File/Iterator/Autoload.php
deleted file mode 100755
index 74a8721d..00000000
--- a/tests/PHPUnit/File/Iterator/Autoload.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * php-file-iterator
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package   File
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @since     File available since Release 1.3.0
- */
-
-function file_iterator_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
-
-    if ($classes === NULL) {
-        $classes = array(
-          'file_iterator' => '/Iterator.php',
-          'file_iterator_facade' => '/Iterator/Facade.php',
-          'file_iterator_factory' => '/Iterator/Factory.php'
-        );
-
-        $path = dirname(dirname(__FILE__));
-    }
-
-    if ($class === NULL) {
-        $result = array(__FILE__);
-
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        require $path . $classes[$cn];
-    }
-}
-
-spl_autoload_register('file_iterator_autoload');
diff --git a/tests/PHPUnit/File/Iterator/Facade.php b/tests/PHPUnit/File/Iterator/Facade.php
deleted file mode 100755
index 11fc6f4e..00000000
--- a/tests/PHPUnit/File/Iterator/Facade.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-/**
- * php-file-iterator
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package   File
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @since     File available since Release 1.3.0
- */
-
-/**
- * Façade implementation that uses File_Iterator_Factory to create a
- * File_Iterator that operates on an AppendIterator that contains an
- * RecursiveDirectoryIterator for each given path. The list of unique
- * files is returned as an array.
- *
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version   Release: 1.3.0
- * @link      http://github.com/sebastianbergmann/php-file-iterator/tree
- * @since     Class available since Release 1.3.0
- */
-class File_Iterator_Facade
-{
-    /**
-     * @param  array|string $paths
-     * @param  array|string $suffixes
-     * @param  array|string $prefixes
-     * @param  array        $exclude
-     * @param  boolean      $commonPath
-     * @return array
-     */
-    public function getFilesAsArray($paths, $suffixes = '', $prefixes = '', array $exclude = array(), $commonPath = FALSE)
-    {
-        if (is_string($paths)) {
-            $paths = array($paths);
-        }
-
-        $factory  = new File_Iterator_Factory;
-        $iterator = $factory->getFileIterator(
-          $paths, $suffixes, $prefixes, $exclude
-        );
-
-        $files = array();
-
-        foreach ($iterator as $file) {
-            $file = $file->getRealPath();
-
-            if ($file) {
-                $files[] = $file;
-            }
-        }
-
-        foreach ($paths as $path) {
-            if (is_file($path)) {
-                $files[] = realpath($path);
-            }
-        }
-
-        $files = array_unique($files);
-        sort($files);
-
-        if ($commonPath) {
-            return array(
-              'commonPath' => $this->getCommonPath($files),
-              'files'      => $files
-            );
-        } else {
-            return $files;
-        }
-    }
-
-    /**
-     * Returns the common path of a set of files.
-     *
-     * @param  array $files
-     * @return string
-     */
-    protected function getCommonPath(array $files)
-    {
-        $count = count($files);
-
-        if ($count == 1) {
-            return dirname($files[0]) . DIRECTORY_SEPARATOR;
-        }
-
-        $_files = array();
-
-        foreach ($files as $file) {
-            $_files[] = $_fileParts = explode(DIRECTORY_SEPARATOR, $file);
-
-            if (empty($_fileParts[0])) {
-                $_fileParts[0] = DIRECTORY_SEPARATOR;
-            }
-        }
-
-        $common = '';
-        $done   = FALSE;
-        $j      = 0;
-        $count--;
-
-        while (!$done) {
-            for ($i = 0; $i < $count; $i++) {
-                if ($_files[$i][$j] != $_files[$i+1][$j]) {
-                    $done = TRUE;
-                    break;
-                }
-            }
-
-            if (!$done) {
-                $common .= $_files[0][$j];
-
-                if ($j > 0) {
-                    $common .= DIRECTORY_SEPARATOR;
-                }
-            }
-
-            $j++;
-        }
-
-        return $common;
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Autoload.php b/tests/PHPUnit/PHP/CodeCoverage/Autoload.php
deleted file mode 100755
index f0a5e996..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Autoload.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-require_once 'File/Iterator/Autoload.php';
-require_once 'PHP/Token/Stream/Autoload.php';
-require_once 'Text/Template/Autoload.php';
-
-function php_codecoverage_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
-
-    if ($classes === NULL) {
-        $classes = array(
-          'php_codecoverage' => '/CodeCoverage.php',
-          'php_codecoverage_driver' => '/CodeCoverage/Driver.php',
-          'php_codecoverage_driver_xdebug' => '/CodeCoverage/Driver/Xdebug.php',
-          'php_codecoverage_exception' => '/CodeCoverage/Exception.php',
-          'php_codecoverage_filter' => '/CodeCoverage/Filter.php',
-          'php_codecoverage_report_clover' => '/CodeCoverage/Report/Clover.php',
-          'php_codecoverage_report_factory' => '/CodeCoverage/Report/Factory.php',
-          'php_codecoverage_report_html' => '/CodeCoverage/Report/HTML.php',
-          'php_codecoverage_report_html_renderer' => '/CodeCoverage/Report/HTML/Renderer.php',
-          'php_codecoverage_report_html_renderer_dashboard' => '/CodeCoverage/Report/HTML/Renderer/Dashboard.php',
-          'php_codecoverage_report_html_renderer_directory' => '/CodeCoverage/Report/HTML/Renderer/Directory.php',
-          'php_codecoverage_report_html_renderer_file' => '/CodeCoverage/Report/HTML/Renderer/File.php',
-          'php_codecoverage_report_node' => '/CodeCoverage/Report/Node.php',
-          'php_codecoverage_report_node_directory' => '/CodeCoverage/Report/Node/Directory.php',
-          'php_codecoverage_report_node_file' => '/CodeCoverage/Report/Node/File.php',
-          'php_codecoverage_report_node_iterator' => '/CodeCoverage/Report/Node/Iterator.php',
-          'php_codecoverage_report_php' => '/CodeCoverage/Report/PHP.php',
-          'php_codecoverage_report_text' => '/CodeCoverage/Report/Text.php',
-          'php_codecoverage_util' => '/CodeCoverage/Util.php'
-        );
-
-        $path = dirname(dirname(__FILE__));
-    }
-
-    if ($class === NULL) {
-        $result = array(__FILE__);
-
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        require $path . $classes[$cn];
-    }
-}
-
-spl_autoload_register('php_codecoverage_autoload');
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Exception.php b/tests/PHPUnit/PHP/CodeCoverage/Exception.php
deleted file mode 100755
index 45686348..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Exception.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Eyception class for PHP_CodeCoverage component.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Exception extends RuntimeException
-{
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Factory.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Factory.php
deleted file mode 100755
index 2afde471..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Factory.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Factory for PHP_CodeCoverage_Report_Node_* object graphs.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Factory
-{
-    /**
-     * @param PHP_CodeCoverage $coverage
-     */
-    public function create(PHP_CodeCoverage $coverage)
-    {
-        $files      = $coverage->getData();
-        $commonPath = $this->reducePaths($files);
-        $root       = new PHP_CodeCoverage_Report_Node_Directory(
-                        $commonPath, NULL
-                      );
-
-        $this->addItems(
-          $root,
-          $this->buildDirectoryStructure($files),
-          $coverage->getTests(),
-          $coverage->getCacheTokens()
-        );
-
-        return $root;
-    }
-
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $root
-     * @param array                                  $items
-     * @param array                                  $tests
-     * @param boolean                                $cacheTokens
-     */
-    protected function addItems(PHP_CodeCoverage_Report_Node_Directory $root, array $items, array $tests, $cacheTokens)
-    {
-        foreach ($items as $key => $value) {
-            if (substr($key, -2) == '/f') {
-                $key = substr($key, 0, -2);
-                $root->addFile($key, $value, $tests, $cacheTokens);
-            } else {
-                $child = $root->addDirectory($key);
-                $this->addItems($child, $value, $tests, $cacheTokens);
-            }
-        }
-    }
-
-    /**
-     * Builds an array representation of the directory structure.
-     *
-     * For instance,
-     *
-     * <code>
-     * Array
-     * (
-     *     [Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * is transformed into
-     *
-     * <code>
-     * Array
-     * (
-     *     [.] => Array
-     *         (
-     *             [Money.php] => Array
-     *                 (
-     *                     ...
-     *                 )
-     *
-     *             [MoneyBag.php] => Array
-     *                 (
-     *                     ...
-     *                 )
-     *         )
-     * )
-     * </code>
-     *
-     * @param  array $files
-     * @return array
-     */
-    protected function buildDirectoryStructure($files)
-    {
-        $result = array();
-
-        foreach ($files as $path => $file) {
-            $path    = explode('/', $path);
-            $pointer = &$result;
-            $max     = count($path);
-
-            for ($i = 0; $i < $max; $i++) {
-                if ($i == ($max - 1)) {
-                    $type = '/f';
-                } else {
-                    $type = '';
-                }
-
-                $pointer = &$pointer[$path[$i] . $type];
-            }
-
-            $pointer = $file;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Reduces the paths by cutting the longest common start path.
-     *
-     * For instance,
-     *
-     * <code>
-     * Array
-     * (
-     *     [/home/sb/Money/Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [/home/sb/Money/MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * is reduced to
-     *
-     * <code>
-     * Array
-     * (
-     *     [Money.php] => Array
-     *         (
-     *             ...
-     *         )
-     *
-     *     [MoneyBag.php] => Array
-     *         (
-     *             ...
-     *         )
-     * )
-     * </code>
-     *
-     * @param  array $files
-     * @return string
-     */
-    protected function reducePaths(&$files)
-    {
-        if (empty($files)) {
-            return '.';
-        }
-
-        $commonPath = '';
-        $paths      = array_keys($files);
-
-        if (count($files) == 1) {
-            $commonPath                 = dirname($paths[0]) . '/';
-            $files[basename($paths[0])] = $files[$paths[0]];
-
-            unset($files[$paths[0]]);
-
-            return $commonPath;
-        }
-
-        $max = count($paths);
-
-        for ($i = 0; $i < $max; $i++) {
-            $paths[$i] = explode(DIRECTORY_SEPARATOR, $paths[$i]);
-
-            if (empty($paths[$i][0])) {
-                $paths[$i][0] = DIRECTORY_SEPARATOR;
-            }
-        }
-
-        $done = FALSE;
-        $max  = count($paths);
-
-        while (!$done) {
-            for ($i = 0; $i < $max - 1; $i++) {
-                if (!isset($paths[$i][0]) ||
-                    !isset($paths[$i+1][0]) ||
-                    $paths[$i][0] != $paths[$i+1][0]) {
-                    $done = TRUE;
-                    break;
-                }
-            }
-
-            if (!$done) {
-                $commonPath .= $paths[0][0];
-
-                if ($paths[0][0] != DIRECTORY_SEPARATOR) {
-                    $commonPath .= DIRECTORY_SEPARATOR;
-                }
-
-                for ($i = 0; $i < $max; $i++) {
-                    array_shift($paths[$i]);
-                }
-            }
-        }
-
-        $original = array_keys($files);
-        $max      = count($original);
-
-        for ($i = 0; $i < $max; $i++) {
-            $files[join('/', $paths[$i])] = $files[$original[$i]];
-            unset($files[$original[$i]]);
-        }
-
-        ksort($files);
-
-        return substr($commonPath, 0, -1);
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer.php b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer.php
deleted file mode 100755
index 5b217e6f..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Base class for PHP_CodeCoverage_Report_Node renderers.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-abstract class PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @var string
-     */
-    protected $templatePath;
-
-    /**
-     * @var string
-     */
-    protected $charset;
-
-    /**
-     * @var string
-     */
-    protected $generator;
-
-    /**
-     * @var string
-     */
-    protected $date;
-
-    /**
-     * @var integer
-     */
-    protected $lowUpperBound;
-
-    /**
-     * @var integer
-     */
-    protected $highLowerBound;
-
-    /**
-     * Constructor.
-     *
-     * @param string  $templatePath
-     * @param string  $charset
-     * @param string  $generator
-     * @param string  $date
-     * @param integer $lowUpperBound
-     * @param integer $highLowerBound
-     */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound)
-    {
-        $this->templatePath   = $templatePath;
-        $this->charset        = $charset;
-        $this->generator      = $generator;
-        $this->date           = $date;
-        $this->lowUpperBound  = $lowUpperBound;
-        $this->highLowerBound = $highLowerBound;
-    }
-
-    /**
-     * @param  integer $percent
-     * @return array
-     */
-    protected function getColorLevel($percent)
-    {
-        if ($percent < $this->lowUpperBound) {
-            $color = 'scarlet_red';
-            $level = 'Lo';
-        }
-
-        else if ($percent >= $this->lowUpperBound &&
-                 $percent <  $this->highLowerBound) {
-            $color = 'butter';
-            $level = 'Med';
-        }
-
-        else {
-            $color = 'chameleon';
-            $level = 'Hi';
-        }
-
-        return array($color, $level);
-    }
-
-    /**
-     * @param  Text_Template $template
-     * @param  array         $data
-     * @return string
-     */
-    protected function renderItemTemplate(Text_Template $template, array $data)
-    {
-        if (isset($data['numClasses']) && $data['numClasses'] > 0) {
-            list($classesColor, $classesLevel) = $this->getColorLevel(
-              $data['testedClassesPercent']
-            );
-
-            $classesNumber = $data['numTestedClasses'] . ' / ' .
-                             $data['numClasses'];
-        } else {
-            $classesColor  = 'snow';
-            $classesLevel  = 'None';
-            $classesNumber = '&nbsp;';
-        }
-
-        if ($data['numMethods'] > 0) {
-            list($methodsColor, $methodsLevel) = $this->getColorLevel(
-              $data['testedMethodsPercent']
-            );
-
-            $methodsNumber = $data['numTestedMethods'] . ' / ' .
-                             $data['numMethods'];
-        } else {
-            $methodsColor  = 'snow';
-            $methodsLevel  = 'None';
-            $methodsNumber = '&nbsp;';
-        }
-
-        list($linesColor, $linesLevel) = $this->getColorLevel(
-          $data['linesExecutedPercent']
-        );
-
-        $template->setVar(
-          array(
-            'itemClass' => isset($data['itemClass']) ? $data['itemClass'] : '',
-            'icon' => isset($data['icon']) ? $data['icon'] : '',
-            'crap' => isset($data['crap']) ? $data['crap'] : '',
-            'name' => $data['name'],
-            'lines_color' => $linesColor,
-            'lines_executed_width' => $data['linesExecutedPercent'],
-            'lines_not_executed_width' => 100 - $data['linesExecutedPercent'],
-            'lines_executed_percent' => $data['linesExecutedPercentAsString'],
-            'lines_level' => $linesLevel,
-            'num_executed_lines' => $data['numExecutedLines'],
-            'num_executable_lines' => $data['numExecutableLines'],
-            'methods_color' => $methodsColor,
-            'methods_tested_width' => $data['testedMethodsPercent'],
-            'methods_not_tested_width' => 100 - $data['testedMethodsPercent'],
-            'methods_tested_percent' => $data['testedMethodsPercentAsString'],
-            'methods_level' => $methodsLevel,
-            'methods_number' => $methodsNumber,
-            'classes_color' => $classesColor,
-            'classes_tested_width' => isset($data['testedClassesPercent']) ? $data['testedClassesPercent'] : '',
-            'classes_not_tested_width' => isset($data['testedClassesPercent']) ? 100 - $data['testedClassesPercent'] : '',
-            'classes_tested_percent' => isset($data['testedClassesPercentAsString']) ? $data['testedClassesPercentAsString'] : '',
-            'classes_level' => $classesLevel,
-            'classes_number' => $classesNumber
-          )
-        );
-
-        return $template->render();
-    }
-
-    /**
-     * @param Text_Template                $template
-     * @param string                       $title
-     * @param PHP_CodeCoverage_Report_Node $node
-     */
-    protected function setCommonTemplateVariables(Text_Template $template, $title, PHP_CodeCoverage_Report_Node $node = NULL)
-    {
-        $link = '';
-
-        if ($node !== NULL) {
-            $path = $node->getPathAsArray();
-
-            foreach ($path as $step) {
-                $link .= sprintf(
-                  '%s<a href="%s.html">%s</a>',
-                  !empty($link) ? '/' : '',
-                  $step->getId(),
-                  $step->getName()
-                );
-            }
-        }
-
-        $template->setVar(
-          array(
-            'title'            => $title,
-            'link'             => $link,
-            'charset'          => $this->charset,
-            'date'             => $this->date,
-            'version'          => '1.1.1',
-            'php_version'      => PHP_VERSION,
-            'generator'        => $this->generator,
-            'low_upper_bound'  => $this->lowUpperBound,
-            'high_lower_bound' => $this->highLowerBound
-          )
-        );
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php
deleted file mode 100755
index ac84186e..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Renders the dashboard for a PHP_CodeCoverage_Report_Node_Directory node.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_Dashboard extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     * @param string                                 $file
-     * @param string                                 $title
-     */
-    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file, $title = NULL)
-    {
-        if ($title === NULL) {
-            $title = $node->getName();
-        }
-
-        $classes  = array_merge($node->getClasses(), $node->getTraits());
-        $template = new Text_Template(
-          $this->templatePath . 'dashboard.html'
-        );
-
-        $this->setCommonTemplateVariables($template, $title);
-
-        $template->setVar(
-          array(
-            'least_tested_methods' => $this->leastTestedMethods($classes),
-            'top_project_risks'    => $this->topProjectRisks($classes),
-            'cc_values'            => $this->classComplexity($classes),
-            'ccd_values'           => $this->classCoverageDistribution($classes),
-            'backlink'             => basename(str_replace('.dashboard', '', $file))
-          )
-        );
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * Returns the data for the Class Complexity chart.
-     *
-     * @param  array $classes
-     * @return string
-     */
-    protected function classComplexity(array $classes)
-    {
-        $data = array();
-
-        foreach ($classes as $name => $class) {
-            $data[] = array(
-              $class['coverage'],
-              $class['ccn'],
-              sprintf(
-                '<a href="%s">%s</a>',
-                $class['link'],
-                $name
-              )
-            );
-        }
-
-        return json_encode($data);
-    }
-
-    /**
-     * Returns the data for the Class Coverage Distribution chart.
-     *
-     * @param  array $classes
-     * @return string
-     */
-    protected function classCoverageDistribution(array $classes)
-    {
-        $data = array(
-          '0%'      => 0,
-          '0-10%'   => 0,
-          '10-20%'  => 0,
-          '20-30%'  => 0,
-          '30-40%'  => 0,
-          '40-50%'  => 0,
-          '50-60%'  => 0,
-          '60-70%'  => 0,
-          '70-80%'  => 0,
-          '80-90%'  => 0,
-          '90-100%' => 0,
-          '100%'    => 0
-        );
-
-        foreach ($classes as $class) {
-            if ($class['coverage'] == 0) {
-                $data['0%']++;
-            }
-
-            else if ($class['coverage'] == 100) {
-                $data['100%']++;
-            }
-
-            else {
-                $key = floor($class['coverage']/10)*10;
-                $key = $key . '-' . ($key + 10) . '%';
-                $data[$key]++;
-            }
-        }
-
-        return json_encode(array_values($data));
-    }
-
-    /**
-     * Returns the least tested methods.
-     *
-     * @param  array   $classes
-     * @param  integer $max
-     * @return string
-     */
-    protected function leastTestedMethods(array $classes, $max = 10)
-    {
-        $methods = array();
-
-        foreach ($classes as $className => $class) {
-            foreach ($class['methods'] as $methodName => $method) {
-                if ($method['coverage'] < 100) {
-                    if ($className != '*') {
-                        $key = $className . '::' . $methodName;
-                    } else {
-                        $key = $methodName;
-                    }
-
-                    $methods[$key] = $method['coverage'];
-                }
-            }
-        }
-
-        asort($methods);
-
-        $methods = array_slice($methods, 0, min($max, count($methods)));
-        $buffer  = '';
-
-        foreach ($methods as $name => $coverage) {
-            list($class, $method) = explode('::', $name);
-
-            $buffer .= sprintf(
-              '              <li><a href="%s">%s</a> (%d%%)</li>' . "\n",
-              $classes[$class]['methods'][$method]['link'],
-              $name,
-              $coverage
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Returns the top project risks according to the CRAP index.
-     *
-     * @param  array   $classes
-     * @param  integer $max
-     * @return string
-     */
-    protected function topProjectRisks(array $classes, $max = 10)
-    {
-        $risks = array();
-
-        foreach ($classes as $className => $class) {
-            if ($class['coverage'] < 100 &&
-                $class['ccn'] > count($class['methods'])) {
-                $risks[$className] = $class['crap'];
-            }
-        }
-
-        arsort($risks);
-
-        $buffer = '';
-        $risks  = array_slice($risks, 0, min($max, count($risks)));
-
-        foreach ($risks as $name => $crap) {
-            $buffer .= sprintf(
-              '              <li><a href="%s">%s</a> (%d)</li>' . "\n",
-              $classes[$name]['link'],
-              $name,
-              $crap
-            );
-        }
-
-        return $buffer;
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
deleted file mode 100755
index a45b9f5a..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php
+++ /dev/null
@@ -1,141 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Renders a PHP_CodeCoverage_Report_Node_Directory node.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_Directory extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     * @param string                                 $file
-     * @param string                                 $title
-     */
-    public function render(PHP_CodeCoverage_Report_Node_Directory $node, $file, $title = NULL)
-    {
-        if ($title === NULL) {
-            $title = $node->getName();
-        }
-
-        $template = new Text_Template($this->templatePath . 'directory.html');
-
-        $this->setCommonTemplateVariables($template, $title, $node);
-
-        $items = $this->renderItem($node, TRUE);
-
-        foreach ($node->getDirectories() as $item) {
-            $items .= $this->renderItem($item);
-        }
-
-        foreach ($node->getFiles() as $item) {
-            $items .= $this->renderItem($item);
-        }
-
-        $template->setVar(
-          array(
-            'id'    => $node->getId(),
-            'items' => $items
-          )
-        );
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node $item
-     * @param  boolean                      $total
-     * @return string
-     */
-    protected function renderItem(PHP_CodeCoverage_Report_Node $item, $total = FALSE)
-    {
-        $data = array(
-          'numClasses'                   => $item->getNumClasses(),
-          'numTestedClasses'             => $item->getNumTestedClasses(),
-          'numMethods'                   => $item->getNumMethods(),
-          'numTestedMethods'             => $item->getNumTestedMethods(),
-          'linesExecutedPercent'         => $item->getLineExecutedPercent(FALSE),
-          'linesExecutedPercentAsString' => $item->getLineExecutedPercent(),
-          'numExecutedLines'             => $item->getNumExecutedLines(),
-          'numExecutableLines'           => $item->getNumExecutableLines(),
-          'testedMethodsPercent'         => $item->getTestedMethodsPercent(FALSE),
-          'testedMethodsPercentAsString' => $item->getTestedMethodsPercent(),
-          'testedClassesPercent'         => $item->getTestedClassesPercent(FALSE),
-          'testedClassesPercentAsString' => $item->getTestedClassesPercent()
-        );
-
-        if ($total) {
-            $data['itemClass'] = 'coverDirectory';
-            $data['name']      = 'Total';
-        } else {
-            $data['name'] = sprintf(
-              '<a href="%s.html">%s</a>',
-              $item->getId(),
-              $item->getName()
-            );
-
-            if ($item instanceof PHP_CodeCoverage_Report_Node_Directory) {
-                $data['icon']      = '<img alt="directory" src="directory.png"/> ';
-                $data['itemClass'] = 'coverDirectory';
-            } else {
-                $data['icon']      = '<img alt="file" src="file.png"/> ';
-                $data['itemClass'] = 'coverFile';
-            }
-        }
-
-        return $this->renderItemTemplate(
-          new Text_Template($this->templatePath . 'directory_item.html'),
-          $data
-        );
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/File.php b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/File.php
deleted file mode 100755
index 286616f0..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/File.php
+++ /dev/null
@@ -1,634 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-if (!defined('T_NAMESPACE')) {
-    define('T_NAMESPACE', 1000);
-}
-
-if (!defined('T_TRAIT')) {
-    define('T_TRAIT', 1001);
-}
-
-/**
- * Renders a PHP_CodeCoverage_Report_Node_File node.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_HTML_Renderer_File extends PHP_CodeCoverage_Report_HTML_Renderer
-{
-    /**
-     * @var boolean
-     */
-    protected $highlight;
-
-    /**
-     * @var boolean
-     */
-    protected $yui;
-
-    /**
-     * Constructor.
-     *
-     * @param string  $templatePath
-     * @param string  $charset
-     * @param string  $generator
-     * @param string  $date
-     * @param integer $lowUpperBound
-     * @param integer $highLowerBound
-     * @param boolean $highlight
-     * @param boolean $yui
-     */
-    public function __construct($templatePath, $charset, $generator, $date, $lowUpperBound, $highLowerBound, $highlight, $yui)
-    {
-        parent::__construct(
-          $templatePath,
-          $charset,
-          $generator,
-          $date,
-          $lowUpperBound,
-          $highLowerBound
-        );
-
-        $this->highlight = $highlight;
-        $this->yui       = $yui;
-    }
-
-    /**
-     * @param PHP_CodeCoverage_Report_Node_File $node
-     * @param string                            $file
-     * @param string                            $title
-     */
-    public function render(PHP_CodeCoverage_Report_Node_File $node, $file, $title = NULL)
-    {
-        if ($title === NULL) {
-            $title = $node->getName();
-        }
-
-        if ($this->yui) {
-            $template = new Text_Template($this->templatePath . 'file.html');
-        } else {
-            $template = new Text_Template(
-              $this->templatePath . 'file_no_yui.html'
-            );
-        }
-
-        list($source, $yuiTemplate) = $this->renderSource($node);
-
-        $template->setVar(
-          array(
-            'items'      => $this->renderItems($node),
-            'source'     => $source,
-            'yuiPanelJS' => $yuiTemplate
-          )
-        );
-
-        $this->setCommonTemplateVariables($template, $title, $node);
-
-        $template->renderTo($file);
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node_File $node
-     * @return string
-     */
-    protected function renderItems(PHP_CodeCoverage_Report_Node_File $node)
-    {
-        $template = new Text_Template($this->templatePath . 'file_item.html');
-
-        $methodItemTemplate = new Text_Template(
-          $this->templatePath . 'method_item.html'
-        );
-
-        $items = $this->renderItemTemplate(
-          $template,
-          array(
-            'itemClass'                    => 'coverDirectory',
-            'name'                         => 'Total',
-            'numClasses'                   => $node->getNumClasses() + $node->getNumTraits(),
-            'numTestedClasses'             => $node->getNumTestedClasses() + $node->getNumTestedTraits(),
-            'numMethods'                   => $node->getNumMethods(),
-            'numTestedMethods'             => $node->getNumTestedMethods(),
-            'linesExecutedPercent'         => $node->getLineExecutedPercent(FALSE),
-            'linesExecutedPercentAsString' => $node->getLineExecutedPercent(),
-            'numExecutedLines'             => $node->getNumExecutedLines(),
-            'numExecutableLines'           => $node->getNumExecutableLines(),
-            'testedMethodsPercent'         => $node->getTestedMethodsPercent(FALSE),
-            'testedMethodsPercentAsString' => $node->getTestedMethodsPercent(),
-            'testedClassesPercent'         => $node->getTestedClassesPercent(FALSE),
-            'testedClassesPercentAsString' => $node->getTestedClassesPercent(),
-            'crap'                         => '<acronym title="Change Risk Anti-Patterns (CRAP) Index">CRAP</acronym>'
-          )
-        );
-
-        $items .= $this->renderFunctionItems(
-          $node->getFunctions(), $methodItemTemplate
-        );
-
-        $items .= $this->renderTraitOrClassItems(
-          $node->getTraits(), $template, $methodItemTemplate
-        );
-
-        $items .= $this->renderTraitOrClassItems(
-          $node->getClasses(), $template, $methodItemTemplate
-        );
-
-        return $items;
-    }
-
-    /**
-     * @param  array         $items
-     * @param  Text_Template $template
-     * @return string
-     */
-    protected function renderTraitOrClassItems(array $items, Text_Template $template, Text_Template $methodItemTemplate)
-    {
-        if (empty($items)) {
-            return '';
-        }
-
-        $buffer = '';
-
-        foreach ($items as $name => $item) {
-            $numMethods       = count($item['methods']);
-            $numTestedMethods = 0;
-
-            foreach ($item['methods'] as $method) {
-                if ($method['executedLines'] == $method['executableLines']) {
-                    $numTestedMethods++;
-                }
-            }
-
-            $buffer .= $this->renderItemTemplate(
-              $template,
-              array(
-                'itemClass'                    => 'coverDirectory',
-                'name'                         => $name,
-                'numClasses'                   => 1,
-                'numTestedClasses'             => $numTestedMethods == $numMethods ? 1 : 0,
-                'numMethods'                   => $numMethods,
-                'numTestedMethods'             => $numTestedMethods,
-                'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $item['executedLines'],
-                                                    $item['executableLines'],
-                                                    FALSE
-                                                  ),
-                'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $item['executedLines'],
-                                                    $item['executableLines'],
-                                                    TRUE
-                                                  ),
-                'numExecutedLines'             => $item['executedLines'],
-                'numExecutableLines'           => $item['executableLines'],
-                'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods,
-                                                    $numMethods,
-                                                    FALSE
-                                                  ),
-                'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods,
-                                                    $numMethods,
-                                                    TRUE
-                                                  ),
-                'testedClassesPercent'         => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods == $numMethods ? 1 : 0,
-                                                    1,
-                                                    FALSE
-                                                  ),
-                'testedClassesPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                    $numTestedMethods == $numMethods ? 1 : 0,
-                                                    1,
-                                                    TRUE
-                                                  ),
-                'crap'                         => $item['crap']
-              )
-            );
-
-            foreach ($item['methods'] as $method) {
-                $buffer .= $this->renderFunctionOrMethodItem(
-                  $methodItemTemplate, $method, '&nbsp;'
-                );
-            }
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  array         $functions
-     * @param  Text_Template $template
-     * @return string
-     */
-    protected function renderFunctionItems(array $functions, Text_Template $template)
-    {
-        if (empty($functions)) {
-            return '';
-        }
-
-        $buffer = '';
-
-        foreach ($functions as $function) {
-            $buffer .= $this->renderFunctionOrMethodItem(
-              $template, $function
-            );
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * @param  Text_Template $template
-     * @return string
-     */
-    protected function renderFunctionOrMethodItem(Text_Template $template, array $item, $indent = '')
-    {
-        $numTestedItems = $item['executedLines'] == $item['executableLines'] ? 1 : 0;
-
-        return $this->renderItemTemplate(
-          $template,
-          array(
-            'name'                         => sprintf(
-                                                '%s<a href="#%d">%s</a>',
-                                                $indent,
-                                                $item['startLine'],
-                                                htmlspecialchars($item['signature'])
-                                              ),
-            'numMethods'                   => 1,
-            'numTestedMethods'             => $numTestedItems,
-            'linesExecutedPercent'         => PHP_CodeCoverage_Util::percent(
-                                                $item['executedLines'],
-                                                $item['executableLines'],
-                                                FALSE
-                                              ),
-            'linesExecutedPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                $item['executedLines'],
-                                                $item['executableLines'],
-                                                TRUE
-                                              ),
-            'numExecutedLines'             => $item['executedLines'],
-            'numExecutableLines'           => $item['executableLines'],
-            'testedMethodsPercent'         => PHP_CodeCoverage_Util::percent(
-                                                $numTestedItems,
-                                                1,
-                                                FALSE
-                                              ),
-            'testedMethodsPercentAsString' => PHP_CodeCoverage_Util::percent(
-                                                $numTestedItems,
-                                                1,
-                                                TRUE
-                                              ),
-            'crap'                         => $item['crap']
-          )
-        );
-    }
-
-    /**
-     * @param  PHP_CodeCoverage_Report_Node_File $node
-     * @return string
-     */
-    protected function renderSource(PHP_CodeCoverage_Report_Node_File $node)
-    {
-        if ($this->yui) {
-            $yuiTemplate = new Text_Template(
-              $this->templatePath . 'yui_item.js'
-            );
-        }
-
-        $coverageData             = $node->getCoverageData();
-        $ignoredLines             = $node->getIgnoredLines();
-        $testData                 = $node->getTestData();
-        list($codeLines, $fillup) = $this->loadFile($node->getPath());
-        $lines                    = '';
-        $yuiPanelJS               = '';
-        $i                        = 1;
-
-        foreach ($codeLines as $line) {
-            $css = '';
-
-            if (!isset($ignoredLines[$i]) && isset($coverageData[$i])) {
-                $count    = '';
-                $numTests = count($coverageData[$i]);
-
-                if ($coverageData[$i] === NULL) {
-                    $color = 'lineDeadCode';
-                    $count = '        ';
-                }
-
-                else if ($numTests == 0) {
-                    $color = 'lineNoCov';
-                    $count = sprintf('%8d', 0);
-                }
-
-                else {
-                    $color = 'lineCov';
-                    $count = sprintf('%8d', $numTests);
-
-                    if ($this->yui) {
-                        $buffer  = '';
-                        $testCSS = '';
-
-                        foreach ($coverageData[$i] as $test) {
-                            switch ($testData[$test]) {
-                                case 0: {
-                                    $testCSS = ' class=\"testPassed\"';
-                                }
-                                break;
-
-                                case 1:
-                                case 2: {
-                                    $testCSS = ' class=\"testIncomplete\"';
-                                }
-                                break;
-
-                                case 3: {
-                                    $testCSS = ' class=\"testFailure\"';
-                                }
-                                break;
-
-                                case 4: {
-                                    $testCSS = ' class=\"testError\"';
-                                }
-                                break;
-
-                                default: {
-                                    $testCSS = '';
-                                }
-                            }
-
-                            $buffer .= sprintf(
-                              '<li%s>%s</li>',
-
-                              $testCSS,
-                              addslashes(htmlspecialchars($test))
-                            );
-                        }
-
-                        if ($numTests > 1) {
-                            $header = $numTests . ' tests cover';
-                        } else {
-                            $header = '1 test covers';
-                        }
-
-                        $header .= ' line ' . $i;
-
-                        $yuiTemplate->setVar(
-                          array(
-                            'line'   => $i,
-                            'header' => $header,
-                            'tests'  => $buffer
-                          ),
-                          FALSE
-                        );
-
-                        $yuiPanelJS .= $yuiTemplate->render();
-                    }
-                }
-
-                $css = sprintf(
-                  '<span class="%s">       %s : ',
-
-                  $color,
-                  $count
-                );
-            }
-
-            $_fillup = array_shift($fillup);
-
-            if ($_fillup > 0) {
-                $line .= str_repeat(' ', $_fillup);
-            }
-
-            $lines .= sprintf(
-              '<span class="lineNum" id="container%d"><a name="%d"></a>'.
-              '<a href="#%d" id="line%d">%8d</a> </span>%s%s%s' . "\n",
-
-              $i,
-              $i,
-              $i,
-              $i,
-              $i,
-              !empty($css) ? $css : '                : ',
-              !$this->highlight ? htmlspecialchars($line) : $line,
-              !empty($css) ? '</span>' : ''
-            );
-
-            $i++;
-        }
-
-        return array($lines, $yuiPanelJS);
-    }
-
-    /**
-     * @param  string $file
-     * @return array
-     */
-    protected function loadFile($file)
-    {
-        $buffer = file_get_contents($file);
-        $lines  = explode("\n", str_replace("\t", '    ', $buffer));
-        $fillup = array();
-        $result = array();
-
-        if (count($lines) == 0) {
-            return $result;
-        }
-
-        $lines       = array_map('rtrim', $lines);
-        $linesLength = array_map('strlen', $lines);
-        $width       = max($linesLength);
-
-        foreach ($linesLength as $line => $length) {
-            $fillup[$line] = $width - $length;
-        }
-
-        if (!$this->highlight) {
-            unset($lines[count($lines)-1]);
-            return array($lines, $fillup);
-        }
-
-        $tokens     = token_get_all($buffer);
-        $stringFlag = FALSE;
-        $i          = 0;
-        $result[$i] = '';
-
-        foreach ($tokens as $j => $token) {
-            if (is_string($token)) {
-                if ($token === '"' && $tokens[$j - 1] !== '\\') {
-                    $result[$i] .= sprintf(
-                      '<span class="string">%s</span>',
-
-                      htmlspecialchars($token)
-                    );
-
-                    $stringFlag = !$stringFlag;
-                } else {
-                    $result[$i] .= sprintf(
-                      '<span class="keyword">%s</span>',
-
-                      htmlspecialchars($token)
-                    );
-                }
-
-                continue;
-            }
-
-            list ($token, $value) = $token;
-
-            $value = str_replace(
-              array("\t", ' '),
-              array('&nbsp;&nbsp;&nbsp;&nbsp;', '&nbsp;'),
-              htmlspecialchars($value)
-            );
-
-            if ($value === "\n") {
-                $result[++$i] = '';
-            } else {
-                $lines = explode("\n", $value);
-
-                foreach ($lines as $jj => $line) {
-                    $line = trim($line);
-
-                    if ($line !== '') {
-                        if ($stringFlag) {
-                            $colour = 'string';
-                        } else {
-                            switch ($token) {
-                                case T_INLINE_HTML: {
-                                    $colour = 'html';
-                                }
-                                break;
-
-                                case T_COMMENT:
-                                case T_DOC_COMMENT: {
-                                    $colour = 'comment';
-                                }
-                                break;
-
-                                case T_ABSTRACT:
-                                case T_ARRAY:
-                                case T_AS:
-                                case T_BREAK:
-                                case T_CASE:
-                                case T_CATCH:
-                                case T_CLASS:
-                                case T_CLONE:
-                                case T_CONTINUE:
-                                case T_DEFAULT:
-                                case T_ECHO:
-                                case T_ELSE:
-                                case T_ELSEIF:
-                                case T_EMPTY:
-                                case T_ENDDECLARE:
-                                case T_ENDFOR:
-                                case T_ENDFOREACH:
-                                case T_ENDIF:
-                                case T_ENDSWITCH:
-                                case T_ENDWHILE:
-                                case T_EXIT:
-                                case T_EXTENDS:
-                                case T_FINAL:
-                                case T_FOREACH:
-                                case T_FUNCTION:
-                                case T_GLOBAL:
-                                case T_IF:
-                                case T_INCLUDE:
-                                case T_INCLUDE_ONCE:
-                                case T_INSTANCEOF:
-                                case T_ISSET:
-                                case T_LOGICAL_AND:
-                                case T_LOGICAL_OR:
-                                case T_LOGICAL_XOR:
-                                case T_NAMESPACE:
-                                case T_NEW:
-                                case T_PRIVATE:
-                                case T_PROTECTED:
-                                case T_PUBLIC:
-                                case T_REQUIRE:
-                                case T_REQUIRE_ONCE:
-                                case T_RETURN:
-                                case T_STATIC:
-                                case T_THROW:
-                                case T_TRAIT:
-                                case T_TRY:
-                                case T_UNSET:
-                                case T_USE:
-                                case T_VAR:
-                                case T_WHILE: {
-                                    $colour = 'keyword';
-                                }
-                                break;
-
-                                default: {
-                                    $colour = 'default';
-                                }
-                            }
-                        }
-
-                        $result[$i] .= sprintf(
-                          '<span class="%s">%s</span>',
-
-                          $colour,
-                          $line
-                        );
-                    }
-
-                    if (isset($lines[$jj + 1])) {
-                        $result[++$i] = '';
-                    }
-                }
-            }
-        }
-
-        unset($result[count($result)-1]);
-
-        return array($result, $fillup);
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/close12_1.gif b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/close12_1.gif
deleted file mode 100755
index e2f67d72efc158da4e069822cbe338915761e396..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHb<YC}pn8?5ooUrHA&F?kc7v6mRqxh4B0R(hF1W2BNNo`8M`DtDwmkh>z
lf$Gy9znh?Y?^x%Bps9Cfw!UsJn!aoAS>7kV)`>G%0|4uCA&me4

diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container-min.js b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container-min.js
deleted file mode 100755
index 5be17aa9..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container-min.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright (c) 2011, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.9.0
-*/
-(function(){YAHOO.util.Config=function(d){if(d){this.init(d);}};var b=YAHOO.lang,c=YAHOO.util.CustomEvent,a=YAHOO.util.Config;a.CONFIG_CHANGED_EVENT="configChanged";a.BOOLEAN_TYPE="boolean";a.prototype={owner:null,queueInProgress:false,config:null,initialConfig:null,eventQueue:null,configChangedEvent:null,init:function(d){this.owner=d;this.configChangedEvent=this.createEvent(a.CONFIG_CHANGED_EVENT);this.configChangedEvent.signature=c.LIST;this.queueInProgress=false;this.config={};this.initialConfig={};this.eventQueue=[];},checkBoolean:function(d){return(typeof d==a.BOOLEAN_TYPE);},checkNumber:function(d){return(!isNaN(d));},fireEvent:function(d,f){var e=this.config[d];if(e&&e.event){e.event.fire(f);}},addProperty:function(e,d){e=e.toLowerCase();this.config[e]=d;d.event=this.createEvent(e,{scope:this.owner});d.event.signature=c.LIST;d.key=e;if(d.handler){d.event.subscribe(d.handler,this.owner);}this.setProperty(e,d.value,true);if(!d.suppressEvent){this.queueProperty(e,d.value);}},getConfig:function(){var d={},f=this.config,g,e;for(g in f){if(b.hasOwnProperty(f,g)){e=f[g];if(e&&e.event){d[g]=e.value;}}}return d;},getProperty:function(d){var e=this.config[d.toLowerCase()];if(e&&e.event){return e.value;}else{return undefined;}},resetProperty:function(d){d=d.toLowerCase();var e=this.config[d];if(e&&e.event){if(d in this.initialConfig){this.setProperty(d,this.initialConfig[d]);return true;}}else{return false;}},setProperty:function(e,g,d){var f;e=e.toLowerCase();if(this.queueInProgress&&!d){this.queueProperty(e,g);return true;}else{f=this.config[e];if(f&&f.event){if(f.validator&&!f.validator(g)){return false;}else{f.value=g;if(!d){this.fireEvent(e,g);this.configChangedEvent.fire([e,g]);}return true;}}else{return false;}}},queueProperty:function(v,r){v=v.toLowerCase();var u=this.config[v],l=false,k,g,h,j,p,t,f,n,o,d,m,w,e;if(u&&u.event){if(!b.isUndefined(r)&&u.validator&&!u.validator(r)){return false;}else{if(!b.isUndefined(r)){u.value=r;}else{r=u.value;}l=false;k=this.eventQueue.length;for(m=0;m<k;m++){g=this.eventQueue[m];if(g){h=g[0];j=g[1];if(h==v){this.eventQueue[m]=null;this.eventQueue.push([v,(!b.isUndefined(r)?r:j)]);l=true;break;}}}if(!l&&!b.isUndefined(r)){this.eventQueue.push([v,r]);}}if(u.supercedes){p=u.supercedes.length;for(w=0;w<p;w++){t=u.supercedes[w];f=this.eventQueue.length;for(e=0;e<f;e++){n=this.eventQueue[e];if(n){o=n[0];d=n[1];if(o==t.toLowerCase()){this.eventQueue.push([o,d]);this.eventQueue[e]=null;break;}}}}}return true;}else{return false;}},refireEvent:function(d){d=d.toLowerCase();var e=this.config[d];if(e&&e.event&&!b.isUndefined(e.value)){if(this.queueInProgress){this.queueProperty(d);}else{this.fireEvent(d,e.value);}}},applyConfig:function(d,g){var f,e;if(g){e={};for(f in d){if(b.hasOwnProperty(d,f)){e[f.toLowerCase()]=d[f];}}this.initialConfig=e;}for(f in d){if(b.hasOwnProperty(d,f)){this.queueProperty(f,d[f]);}}},refresh:function(){var d;for(d in this.config){if(b.hasOwnProperty(this.config,d)){this.refireEvent(d);}}},fireQueue:function(){var e,h,d,g,f;this.queueInProgress=true;for(e=0;e<this.eventQueue.length;e++){h=this.eventQueue[e];if(h){d=h[0];g=h[1];f=this.config[d];f.value=g;this.eventQueue[e]=null;this.fireEvent(d,g);}}this.queueInProgress=false;this.eventQueue=[];},subscribeToConfigEvent:function(d,e,g,h){var f=this.config[d.toLowerCase()];if(f&&f.event){if(!a.alreadySubscribed(f.event,e,g)){f.event.subscribe(e,g,h);}return true;}else{return false;}},unsubscribeFromConfigEvent:function(d,e,g){var f=this.config[d.toLowerCase()];if(f&&f.event){return f.event.unsubscribe(e,g);}else{return false;}},toString:function(){var d="Config";if(this.owner){d+=" ["+this.owner.toString()+"]";}return d;},outputEventQueue:function(){var d="",g,e,f=this.eventQueue.length;for(e=0;e<f;e++){g=this.eventQueue[e];if(g){d+=g[0]+"="+g[1]+", ";}}return d;},destroy:function(){var e=this.config,d,f;for(d in e){if(b.hasOwnProperty(e,d)){f=e[d];f.event.unsubscribeAll();f.event=null;}}this.configChangedEvent.unsubscribeAll();this.configChangedEvent=null;this.owner=null;this.config=null;this.initialConfig=null;this.eventQueue=null;}};a.alreadySubscribed=function(e,h,j){var f=e.subscribers.length,d,g;if(f>0){g=f-1;do{d=e.subscribers[g];if(d&&d.obj==j&&d.fn==h){return true;}}while(g--);}return false;};YAHOO.lang.augmentProto(a,YAHOO.util.EventProvider);}());(function(){YAHOO.widget.Module=function(r,q){if(r){this.init(r,q);}else{}};var f=YAHOO.util.Dom,d=YAHOO.util.Config,n=YAHOO.util.Event,m=YAHOO.util.CustomEvent,g=YAHOO.widget.Module,i=YAHOO.env.ua,h,p,o,e,a={"BEFORE_INIT":"beforeInit","INIT":"init","APPEND":"append","BEFORE_RENDER":"beforeRender","RENDER":"render","CHANGE_HEADER":"changeHeader","CHANGE_BODY":"changeBody","CHANGE_FOOTER":"changeFooter","CHANGE_CONTENT":"changeContent","DESTROY":"destroy","BEFORE_SHOW":"beforeShow","SHOW":"show","BEFORE_HIDE":"beforeHide","HIDE":"hide"},j={"VISIBLE":{key:"visible",value:true,validator:YAHOO.lang.isBoolean},"EFFECT":{key:"effect",suppressEvent:true,supercedes:["visible"]},"MONITOR_RESIZE":{key:"monitorresize",value:true},"APPEND_TO_DOCUMENT_BODY":{key:"appendtodocumentbody",value:false}};g.IMG_ROOT=null;g.IMG_ROOT_SSL=null;g.CSS_MODULE="yui-module";g.CSS_HEADER="hd";g.CSS_BODY="bd";g.CSS_FOOTER="ft";g.RESIZE_MONITOR_SECURE_URL="javascript:false;";g.RESIZE_MONITOR_BUFFER=1;g.textResizeEvent=new m("textResize");g.forceDocumentRedraw=function(){var q=document.documentElement;if(q){q.className+=" ";q.className=YAHOO.lang.trim(q.className);}};function l(){if(!h){h=document.createElement("div");h.innerHTML=('<div class="'+g.CSS_HEADER+'"></div>'+'<div class="'+g.CSS_BODY+'"></div><div class="'+g.CSS_FOOTER+'"></div>');p=h.firstChild;o=p.nextSibling;e=o.nextSibling;}return h;}function k(){if(!p){l();}return(p.cloneNode(false));}function b(){if(!o){l();}return(o.cloneNode(false));}function c(){if(!e){l();}return(e.cloneNode(false));}g.prototype={constructor:g,element:null,header:null,body:null,footer:null,id:null,imageRoot:g.IMG_ROOT,initEvents:function(){var q=m.LIST;
-this.beforeInitEvent=this.createEvent(a.BEFORE_INIT);this.beforeInitEvent.signature=q;this.initEvent=this.createEvent(a.INIT);this.initEvent.signature=q;this.appendEvent=this.createEvent(a.APPEND);this.appendEvent.signature=q;this.beforeRenderEvent=this.createEvent(a.BEFORE_RENDER);this.beforeRenderEvent.signature=q;this.renderEvent=this.createEvent(a.RENDER);this.renderEvent.signature=q;this.changeHeaderEvent=this.createEvent(a.CHANGE_HEADER);this.changeHeaderEvent.signature=q;this.changeBodyEvent=this.createEvent(a.CHANGE_BODY);this.changeBodyEvent.signature=q;this.changeFooterEvent=this.createEvent(a.CHANGE_FOOTER);this.changeFooterEvent.signature=q;this.changeContentEvent=this.createEvent(a.CHANGE_CONTENT);this.changeContentEvent.signature=q;this.destroyEvent=this.createEvent(a.DESTROY);this.destroyEvent.signature=q;this.beforeShowEvent=this.createEvent(a.BEFORE_SHOW);this.beforeShowEvent.signature=q;this.showEvent=this.createEvent(a.SHOW);this.showEvent.signature=q;this.beforeHideEvent=this.createEvent(a.BEFORE_HIDE);this.beforeHideEvent.signature=q;this.hideEvent=this.createEvent(a.HIDE);this.hideEvent.signature=q;},platform:function(){var q=navigator.userAgent.toLowerCase();if(q.indexOf("windows")!=-1||q.indexOf("win32")!=-1){return"windows";}else{if(q.indexOf("macintosh")!=-1){return"mac";}else{return false;}}}(),browser:function(){var q=navigator.userAgent.toLowerCase();if(q.indexOf("opera")!=-1){return"opera";}else{if(q.indexOf("msie 7")!=-1){return"ie7";}else{if(q.indexOf("msie")!=-1){return"ie";}else{if(q.indexOf("safari")!=-1){return"safari";}else{if(q.indexOf("gecko")!=-1){return"gecko";}else{return false;}}}}}}(),isSecure:function(){if(window.location.href.toLowerCase().indexOf("https")===0){return true;}else{return false;}}(),initDefaultConfig:function(){this.cfg.addProperty(j.VISIBLE.key,{handler:this.configVisible,value:j.VISIBLE.value,validator:j.VISIBLE.validator});this.cfg.addProperty(j.EFFECT.key,{handler:this.configEffect,suppressEvent:j.EFFECT.suppressEvent,supercedes:j.EFFECT.supercedes});this.cfg.addProperty(j.MONITOR_RESIZE.key,{handler:this.configMonitorResize,value:j.MONITOR_RESIZE.value});this.cfg.addProperty(j.APPEND_TO_DOCUMENT_BODY.key,{value:j.APPEND_TO_DOCUMENT_BODY.value});},init:function(v,u){var s,w;this.initEvents();this.beforeInitEvent.fire(g);this.cfg=new d(this);if(this.isSecure){this.imageRoot=g.IMG_ROOT_SSL;}if(typeof v=="string"){s=v;v=document.getElementById(v);if(!v){v=(l()).cloneNode(false);v.id=s;}}this.id=f.generateId(v);this.element=v;w=this.element.firstChild;if(w){var r=false,q=false,t=false;do{if(1==w.nodeType){if(!r&&f.hasClass(w,g.CSS_HEADER)){this.header=w;r=true;}else{if(!q&&f.hasClass(w,g.CSS_BODY)){this.body=w;q=true;}else{if(!t&&f.hasClass(w,g.CSS_FOOTER)){this.footer=w;t=true;}}}}}while((w=w.nextSibling));}this.initDefaultConfig();f.addClass(this.element,g.CSS_MODULE);if(u){this.cfg.applyConfig(u,true);}if(!d.alreadySubscribed(this.renderEvent,this.cfg.fireQueue,this.cfg)){this.renderEvent.subscribe(this.cfg.fireQueue,this.cfg,true);}this.initEvent.fire(g);},initResizeMonitor:function(){var r=(i.gecko&&this.platform=="windows");if(r){var q=this;setTimeout(function(){q._initResizeMonitor();},0);}else{this._initResizeMonitor();}},_initResizeMonitor:function(){var q,s,u;function w(){g.textResizeEvent.fire();}if(!i.opera){s=f.get("_yuiResizeMonitor");var v=this._supportsCWResize();if(!s){s=document.createElement("iframe");if(this.isSecure&&g.RESIZE_MONITOR_SECURE_URL&&i.ie){s.src=g.RESIZE_MONITOR_SECURE_URL;}if(!v){u=["<html><head><script ",'type="text/javascript">',"window.onresize=function(){window.parent.","YAHOO.widget.Module.textResizeEvent.","fire();};<","/script></head>","<body></body></html>"].join("");s.src="data:text/html;charset=utf-8,"+encodeURIComponent(u);}s.id="_yuiResizeMonitor";s.title="Text Resize Monitor";s.tabIndex=-1;s.setAttribute("role","presentation");s.style.position="absolute";s.style.visibility="hidden";var r=document.body,t=r.firstChild;if(t){r.insertBefore(s,t);}else{r.appendChild(s);}s.style.backgroundColor="transparent";s.style.borderWidth="0";s.style.width="2em";s.style.height="2em";s.style.left="0";s.style.top=(-1*(s.offsetHeight+g.RESIZE_MONITOR_BUFFER))+"px";s.style.visibility="visible";if(i.webkit){q=s.contentWindow.document;q.open();q.close();}}if(s&&s.contentWindow){g.textResizeEvent.subscribe(this.onDomResize,this,true);if(!g.textResizeInitialized){if(v){if(!n.on(s.contentWindow,"resize",w)){n.on(s,"resize",w);}}g.textResizeInitialized=true;}this.resizeMonitor=s;}}},_supportsCWResize:function(){var q=true;if(i.gecko&&i.gecko<=1.8){q=false;}return q;},onDomResize:function(s,r){var q=-1*(this.resizeMonitor.offsetHeight+g.RESIZE_MONITOR_BUFFER);this.resizeMonitor.style.top=q+"px";this.resizeMonitor.style.left="0";},setHeader:function(r){var q=this.header||(this.header=k());if(r.nodeName){q.innerHTML="";q.appendChild(r);}else{q.innerHTML=r;}if(this._rendered){this._renderHeader();}this.changeHeaderEvent.fire(r);this.changeContentEvent.fire();},appendToHeader:function(r){var q=this.header||(this.header=k());q.appendChild(r);this.changeHeaderEvent.fire(r);this.changeContentEvent.fire();},setBody:function(r){var q=this.body||(this.body=b());if(r.nodeName){q.innerHTML="";q.appendChild(r);}else{q.innerHTML=r;}if(this._rendered){this._renderBody();}this.changeBodyEvent.fire(r);this.changeContentEvent.fire();},appendToBody:function(r){var q=this.body||(this.body=b());q.appendChild(r);this.changeBodyEvent.fire(r);this.changeContentEvent.fire();},setFooter:function(r){var q=this.footer||(this.footer=c());if(r.nodeName){q.innerHTML="";q.appendChild(r);}else{q.innerHTML=r;}if(this._rendered){this._renderFooter();}this.changeFooterEvent.fire(r);this.changeContentEvent.fire();},appendToFooter:function(r){var q=this.footer||(this.footer=c());q.appendChild(r);this.changeFooterEvent.fire(r);this.changeContentEvent.fire();},render:function(s,q){var t=this;function r(u){if(typeof u=="string"){u=document.getElementById(u);
-}if(u){t._addToParent(u,t.element);t.appendEvent.fire();}}this.beforeRenderEvent.fire();if(!q){q=this.element;}if(s){r(s);}else{if(!f.inDocument(this.element)){return false;}}this._renderHeader(q);this._renderBody(q);this._renderFooter(q);this._rendered=true;this.renderEvent.fire();return true;},_renderHeader:function(q){q=q||this.element;if(this.header&&!f.inDocument(this.header)){var r=q.firstChild;if(r){q.insertBefore(this.header,r);}else{q.appendChild(this.header);}}},_renderBody:function(q){q=q||this.element;if(this.body&&!f.inDocument(this.body)){if(this.footer&&f.isAncestor(q,this.footer)){q.insertBefore(this.body,this.footer);}else{q.appendChild(this.body);}}},_renderFooter:function(q){q=q||this.element;if(this.footer&&!f.inDocument(this.footer)){q.appendChild(this.footer);}},destroy:function(q){var r,s=!(q);if(this.element){n.purgeElement(this.element,s);r=this.element.parentNode;}if(r){r.removeChild(this.element);}this.element=null;this.header=null;this.body=null;this.footer=null;g.textResizeEvent.unsubscribe(this.onDomResize,this);this.cfg.destroy();this.cfg=null;this.destroyEvent.fire();},show:function(){this.cfg.setProperty("visible",true);},hide:function(){this.cfg.setProperty("visible",false);},configVisible:function(r,q,s){var t=q[0];if(t){if(this.beforeShowEvent.fire()){f.setStyle(this.element,"display","block");this.showEvent.fire();}}else{if(this.beforeHideEvent.fire()){f.setStyle(this.element,"display","none");this.hideEvent.fire();}}},configEffect:function(r,q,s){this._cachedEffects=(this.cacheEffects)?this._createEffects(q[0]):null;},cacheEffects:true,_createEffects:function(t){var q=null,u,r,s;if(t){if(t instanceof Array){q=[];u=t.length;for(r=0;r<u;r++){s=t[r];if(s.effect){q[q.length]=s.effect(this,s.duration);}}}else{if(t.effect){q=[t.effect(this,t.duration)];}}}return q;},configMonitorResize:function(s,r,t){var q=r[0];if(q){this.initResizeMonitor();}else{g.textResizeEvent.unsubscribe(this.onDomResize,this,true);this.resizeMonitor=null;}},_addToParent:function(q,r){if(!this.cfg.getProperty("appendtodocumentbody")&&q===document.body&&q.firstChild){q.insertBefore(r,q.firstChild);}else{q.appendChild(r);}},toString:function(){return"Module "+this.id;}};YAHOO.lang.augmentProto(g,YAHOO.util.EventProvider);}());(function(){YAHOO.widget.Overlay=function(p,o){YAHOO.widget.Overlay.superclass.constructor.call(this,p,o);};var i=YAHOO.lang,m=YAHOO.util.CustomEvent,g=YAHOO.widget.Module,n=YAHOO.util.Event,f=YAHOO.util.Dom,d=YAHOO.util.Config,k=YAHOO.env.ua,b=YAHOO.widget.Overlay,h="subscribe",e="unsubscribe",c="contained",j,a={"BEFORE_MOVE":"beforeMove","MOVE":"move"},l={"X":{key:"x",validator:i.isNumber,suppressEvent:true,supercedes:["iframe"]},"Y":{key:"y",validator:i.isNumber,suppressEvent:true,supercedes:["iframe"]},"XY":{key:"xy",suppressEvent:true,supercedes:["iframe"]},"CONTEXT":{key:"context",suppressEvent:true,supercedes:["iframe"]},"FIXED_CENTER":{key:"fixedcenter",value:false,supercedes:["iframe","visible"]},"WIDTH":{key:"width",suppressEvent:true,supercedes:["context","fixedcenter","iframe"]},"HEIGHT":{key:"height",suppressEvent:true,supercedes:["context","fixedcenter","iframe"]},"AUTO_FILL_HEIGHT":{key:"autofillheight",supercedes:["height"],value:"body"},"ZINDEX":{key:"zindex",value:null},"CONSTRAIN_TO_VIEWPORT":{key:"constraintoviewport",value:false,validator:i.isBoolean,supercedes:["iframe","x","y","xy"]},"IFRAME":{key:"iframe",value:(k.ie==6?true:false),validator:i.isBoolean,supercedes:["zindex"]},"PREVENT_CONTEXT_OVERLAP":{key:"preventcontextoverlap",value:false,validator:i.isBoolean,supercedes:["constraintoviewport"]}};b.IFRAME_SRC="javascript:false;";b.IFRAME_OFFSET=3;b.VIEWPORT_OFFSET=10;b.TOP_LEFT="tl";b.TOP_RIGHT="tr";b.BOTTOM_LEFT="bl";b.BOTTOM_RIGHT="br";b.PREVENT_OVERLAP_X={"tltr":true,"blbr":true,"brbl":true,"trtl":true};b.PREVENT_OVERLAP_Y={"trbr":true,"tlbl":true,"bltl":true,"brtr":true};b.CSS_OVERLAY="yui-overlay";b.CSS_HIDDEN="yui-overlay-hidden";b.CSS_IFRAME="yui-overlay-iframe";b.STD_MOD_RE=/^\s*?(body|footer|header)\s*?$/i;b.windowScrollEvent=new m("windowScroll");b.windowResizeEvent=new m("windowResize");b.windowScrollHandler=function(p){var o=n.getTarget(p);if(!o||o===window||o===window.document){if(k.ie){if(!window.scrollEnd){window.scrollEnd=-1;}clearTimeout(window.scrollEnd);window.scrollEnd=setTimeout(function(){b.windowScrollEvent.fire();},1);}else{b.windowScrollEvent.fire();}}};b.windowResizeHandler=function(o){if(k.ie){if(!window.resizeEnd){window.resizeEnd=-1;}clearTimeout(window.resizeEnd);window.resizeEnd=setTimeout(function(){b.windowResizeEvent.fire();},100);}else{b.windowResizeEvent.fire();}};b._initialized=null;if(b._initialized===null){n.on(window,"scroll",b.windowScrollHandler);n.on(window,"resize",b.windowResizeHandler);b._initialized=true;}b._TRIGGER_MAP={"windowScroll":b.windowScrollEvent,"windowResize":b.windowResizeEvent,"textResize":g.textResizeEvent};YAHOO.extend(b,g,{CONTEXT_TRIGGERS:[],init:function(p,o){b.superclass.init.call(this,p);this.beforeInitEvent.fire(b);f.addClass(this.element,b.CSS_OVERLAY);if(o){this.cfg.applyConfig(o,true);}if(this.platform=="mac"&&k.gecko){if(!d.alreadySubscribed(this.showEvent,this.showMacGeckoScrollbars,this)){this.showEvent.subscribe(this.showMacGeckoScrollbars,this,true);}if(!d.alreadySubscribed(this.hideEvent,this.hideMacGeckoScrollbars,this)){this.hideEvent.subscribe(this.hideMacGeckoScrollbars,this,true);}}this.initEvent.fire(b);},initEvents:function(){b.superclass.initEvents.call(this);var o=m.LIST;this.beforeMoveEvent=this.createEvent(a.BEFORE_MOVE);this.beforeMoveEvent.signature=o;this.moveEvent=this.createEvent(a.MOVE);this.moveEvent.signature=o;},initDefaultConfig:function(){b.superclass.initDefaultConfig.call(this);var o=this.cfg;o.addProperty(l.X.key,{handler:this.configX,validator:l.X.validator,suppressEvent:l.X.suppressEvent,supercedes:l.X.supercedes});o.addProperty(l.Y.key,{handler:this.configY,validator:l.Y.validator,suppressEvent:l.Y.suppressEvent,supercedes:l.Y.supercedes});
-o.addProperty(l.XY.key,{handler:this.configXY,suppressEvent:l.XY.suppressEvent,supercedes:l.XY.supercedes});o.addProperty(l.CONTEXT.key,{handler:this.configContext,suppressEvent:l.CONTEXT.suppressEvent,supercedes:l.CONTEXT.supercedes});o.addProperty(l.FIXED_CENTER.key,{handler:this.configFixedCenter,value:l.FIXED_CENTER.value,validator:l.FIXED_CENTER.validator,supercedes:l.FIXED_CENTER.supercedes});o.addProperty(l.WIDTH.key,{handler:this.configWidth,suppressEvent:l.WIDTH.suppressEvent,supercedes:l.WIDTH.supercedes});o.addProperty(l.HEIGHT.key,{handler:this.configHeight,suppressEvent:l.HEIGHT.suppressEvent,supercedes:l.HEIGHT.supercedes});o.addProperty(l.AUTO_FILL_HEIGHT.key,{handler:this.configAutoFillHeight,value:l.AUTO_FILL_HEIGHT.value,validator:this._validateAutoFill,supercedes:l.AUTO_FILL_HEIGHT.supercedes});o.addProperty(l.ZINDEX.key,{handler:this.configzIndex,value:l.ZINDEX.value});o.addProperty(l.CONSTRAIN_TO_VIEWPORT.key,{handler:this.configConstrainToViewport,value:l.CONSTRAIN_TO_VIEWPORT.value,validator:l.CONSTRAIN_TO_VIEWPORT.validator,supercedes:l.CONSTRAIN_TO_VIEWPORT.supercedes});o.addProperty(l.IFRAME.key,{handler:this.configIframe,value:l.IFRAME.value,validator:l.IFRAME.validator,supercedes:l.IFRAME.supercedes});o.addProperty(l.PREVENT_CONTEXT_OVERLAP.key,{value:l.PREVENT_CONTEXT_OVERLAP.value,validator:l.PREVENT_CONTEXT_OVERLAP.validator,supercedes:l.PREVENT_CONTEXT_OVERLAP.supercedes});},moveTo:function(o,p){this.cfg.setProperty("xy",[o,p]);},hideMacGeckoScrollbars:function(){f.replaceClass(this.element,"show-scrollbars","hide-scrollbars");},showMacGeckoScrollbars:function(){f.replaceClass(this.element,"hide-scrollbars","show-scrollbars");},_setDomVisibility:function(o){f.setStyle(this.element,"visibility",(o)?"visible":"hidden");var p=b.CSS_HIDDEN;if(o){f.removeClass(this.element,p);}else{f.addClass(this.element,p);}},configVisible:function(x,w,t){var p=w[0],B=f.getStyle(this.element,"visibility"),o=this._cachedEffects||this._createEffects(this.cfg.getProperty("effect")),A=(this.platform=="mac"&&k.gecko),y=d.alreadySubscribed,q,v,s,r,u,z;if(B=="inherit"){v=this.element.parentNode;while(v.nodeType!=9&&v.nodeType!=11){B=f.getStyle(v,"visibility");if(B!="inherit"){break;}v=v.parentNode;}if(B=="inherit"){B="visible";}}if(p){if(A){this.showMacGeckoScrollbars();}if(o){if(p){if(B!="visible"||B===""||this._fadingOut){if(this.beforeShowEvent.fire()){z=o.length;for(s=0;s<z;s++){q=o[s];if(s===0&&!y(q.animateInCompleteEvent,this.showEvent.fire,this.showEvent)){q.animateInCompleteEvent.subscribe(this.showEvent.fire,this.showEvent,true);}q.animateIn();}}}}}else{if(B!="visible"||B===""){if(this.beforeShowEvent.fire()){this._setDomVisibility(true);this.cfg.refireEvent("iframe");this.showEvent.fire();}}else{this._setDomVisibility(true);}}}else{if(A){this.hideMacGeckoScrollbars();}if(o){if(B=="visible"||this._fadingIn){if(this.beforeHideEvent.fire()){z=o.length;for(r=0;r<z;r++){u=o[r];if(r===0&&!y(u.animateOutCompleteEvent,this.hideEvent.fire,this.hideEvent)){u.animateOutCompleteEvent.subscribe(this.hideEvent.fire,this.hideEvent,true);}u.animateOut();}}}else{if(B===""){this._setDomVisibility(false);}}}else{if(B=="visible"||B===""){if(this.beforeHideEvent.fire()){this._setDomVisibility(false);this.hideEvent.fire();}}else{this._setDomVisibility(false);}}}},doCenterOnDOMEvent:function(){var o=this.cfg,p=o.getProperty("fixedcenter");if(o.getProperty("visible")){if(p&&(p!==c||this.fitsInViewport())){this.center();}}},fitsInViewport:function(){var s=b.VIEWPORT_OFFSET,q=this.element,t=q.offsetWidth,r=q.offsetHeight,o=f.getViewportWidth(),p=f.getViewportHeight();return((t+s<o)&&(r+s<p));},configFixedCenter:function(s,q,t){var u=q[0],p=d.alreadySubscribed,r=b.windowResizeEvent,o=b.windowScrollEvent;if(u){this.center();if(!p(this.beforeShowEvent,this.center)){this.beforeShowEvent.subscribe(this.center);}if(!p(r,this.doCenterOnDOMEvent,this)){r.subscribe(this.doCenterOnDOMEvent,this,true);}if(!p(o,this.doCenterOnDOMEvent,this)){o.subscribe(this.doCenterOnDOMEvent,this,true);}}else{this.beforeShowEvent.unsubscribe(this.center);r.unsubscribe(this.doCenterOnDOMEvent,this);o.unsubscribe(this.doCenterOnDOMEvent,this);}},configHeight:function(r,p,s){var o=p[0],q=this.element;f.setStyle(q,"height",o);this.cfg.refireEvent("iframe");},configAutoFillHeight:function(t,s,p){var v=s[0],q=this.cfg,u="autofillheight",w="height",r=q.getProperty(u),o=this._autoFillOnHeightChange;q.unsubscribeFromConfigEvent(w,o);g.textResizeEvent.unsubscribe(o);this.changeContentEvent.unsubscribe(o);if(r&&v!==r&&this[r]){f.setStyle(this[r],w,"");}if(v){v=i.trim(v.toLowerCase());q.subscribeToConfigEvent(w,o,this[v],this);g.textResizeEvent.subscribe(o,this[v],this);this.changeContentEvent.subscribe(o,this[v],this);q.setProperty(u,v,true);}},configWidth:function(r,o,s){var q=o[0],p=this.element;f.setStyle(p,"width",q);this.cfg.refireEvent("iframe");},configzIndex:function(q,o,r){var s=o[0],p=this.element;if(!s){s=f.getStyle(p,"zIndex");if(!s||isNaN(s)){s=0;}}if(this.iframe||this.cfg.getProperty("iframe")===true){if(s<=0){s=1;}}f.setStyle(p,"zIndex",s);this.cfg.setProperty("zIndex",s,true);if(this.iframe){this.stackIframe();}},configXY:function(q,p,r){var t=p[0],o=t[0],s=t[1];this.cfg.setProperty("x",o);this.cfg.setProperty("y",s);this.beforeMoveEvent.fire([o,s]);o=this.cfg.getProperty("x");s=this.cfg.getProperty("y");this.cfg.refireEvent("iframe");this.moveEvent.fire([o,s]);},configX:function(q,p,r){var o=p[0],s=this.cfg.getProperty("y");this.cfg.setProperty("x",o,true);this.cfg.setProperty("y",s,true);this.beforeMoveEvent.fire([o,s]);o=this.cfg.getProperty("x");s=this.cfg.getProperty("y");f.setX(this.element,o,true);this.cfg.setProperty("xy",[o,s],true);this.cfg.refireEvent("iframe");this.moveEvent.fire([o,s]);},configY:function(q,p,r){var o=this.cfg.getProperty("x"),s=p[0];this.cfg.setProperty("x",o,true);this.cfg.setProperty("y",s,true);this.beforeMoveEvent.fire([o,s]);o=this.cfg.getProperty("x");s=this.cfg.getProperty("y");f.setY(this.element,s,true);
-this.cfg.setProperty("xy",[o,s],true);this.cfg.refireEvent("iframe");this.moveEvent.fire([o,s]);},showIframe:function(){var p=this.iframe,o;if(p){o=this.element.parentNode;if(o!=p.parentNode){this._addToParent(o,p);}p.style.display="block";}},hideIframe:function(){if(this.iframe){this.iframe.style.display="none";}},syncIframe:function(){var o=this.iframe,q=this.element,s=b.IFRAME_OFFSET,p=(s*2),r;if(o){o.style.width=(q.offsetWidth+p+"px");o.style.height=(q.offsetHeight+p+"px");r=this.cfg.getProperty("xy");if(!i.isArray(r)||(isNaN(r[0])||isNaN(r[1]))){this.syncPosition();r=this.cfg.getProperty("xy");}f.setXY(o,[(r[0]-s),(r[1]-s)]);}},stackIframe:function(){if(this.iframe){var o=f.getStyle(this.element,"zIndex");if(!YAHOO.lang.isUndefined(o)&&!isNaN(o)){f.setStyle(this.iframe,"zIndex",(o-1));}}},configIframe:function(r,q,s){var o=q[0];function t(){var v=this.iframe,w=this.element,x;if(!v){if(!j){j=document.createElement("iframe");if(this.isSecure){j.src=b.IFRAME_SRC;}if(k.ie){j.style.filter="alpha(opacity=0)";j.frameBorder=0;}else{j.style.opacity="0";}j.style.position="absolute";j.style.border="none";j.style.margin="0";j.style.padding="0";j.style.display="none";j.tabIndex=-1;j.className=b.CSS_IFRAME;}v=j.cloneNode(false);v.id=this.id+"_f";x=w.parentNode;var u=x||document.body;this._addToParent(u,v);this.iframe=v;}this.showIframe();this.syncIframe();this.stackIframe();if(!this._hasIframeEventListeners){this.showEvent.subscribe(this.showIframe);this.hideEvent.subscribe(this.hideIframe);this.changeContentEvent.subscribe(this.syncIframe);this._hasIframeEventListeners=true;}}function p(){t.call(this);this.beforeShowEvent.unsubscribe(p);this._iframeDeferred=false;}if(o){if(this.cfg.getProperty("visible")){t.call(this);}else{if(!this._iframeDeferred){this.beforeShowEvent.subscribe(p);this._iframeDeferred=true;}}}else{this.hideIframe();if(this._hasIframeEventListeners){this.showEvent.unsubscribe(this.showIframe);this.hideEvent.unsubscribe(this.hideIframe);this.changeContentEvent.unsubscribe(this.syncIframe);this._hasIframeEventListeners=false;}}},_primeXYFromDOM:function(){if(YAHOO.lang.isUndefined(this.cfg.getProperty("xy"))){this.syncPosition();this.cfg.refireEvent("xy");this.beforeShowEvent.unsubscribe(this._primeXYFromDOM);}},configConstrainToViewport:function(p,o,q){var r=o[0];if(r){if(!d.alreadySubscribed(this.beforeMoveEvent,this.enforceConstraints,this)){this.beforeMoveEvent.subscribe(this.enforceConstraints,this,true);}if(!d.alreadySubscribed(this.beforeShowEvent,this._primeXYFromDOM)){this.beforeShowEvent.subscribe(this._primeXYFromDOM);}}else{this.beforeShowEvent.unsubscribe(this._primeXYFromDOM);this.beforeMoveEvent.unsubscribe(this.enforceConstraints,this);}},configContext:function(u,t,q){var x=t[0],r,o,v,s,p,w=this.CONTEXT_TRIGGERS;if(x){r=x[0];o=x[1];v=x[2];s=x[3];p=x[4];if(w&&w.length>0){s=(s||[]).concat(w);}if(r){if(typeof r=="string"){this.cfg.setProperty("context",[document.getElementById(r),o,v,s,p],true);}if(o&&v){this.align(o,v,p);}if(this._contextTriggers){this._processTriggers(this._contextTriggers,e,this._alignOnTrigger);}if(s){this._processTriggers(s,h,this._alignOnTrigger);this._contextTriggers=s;}}}},_alignOnTrigger:function(p,o){this.align();},_findTriggerCE:function(o){var p=null;if(o instanceof m){p=o;}else{if(b._TRIGGER_MAP[o]){p=b._TRIGGER_MAP[o];}}return p;},_processTriggers:function(s,v,r){var q,u;for(var p=0,o=s.length;p<o;++p){q=s[p];u=this._findTriggerCE(q);if(u){u[v](r,this,true);}else{this[v](q,r);}}},align:function(p,w,s){var v=this.cfg.getProperty("context"),t=this,o,q,u;function r(z,A){var y=null,x=null;switch(p){case b.TOP_LEFT:y=A;x=z;break;case b.TOP_RIGHT:y=A-q.offsetWidth;x=z;break;case b.BOTTOM_LEFT:y=A;x=z-q.offsetHeight;break;case b.BOTTOM_RIGHT:y=A-q.offsetWidth;x=z-q.offsetHeight;break;}if(y!==null&&x!==null){if(s){y+=s[0];x+=s[1];}t.moveTo(y,x);}}if(v){o=v[0];q=this.element;t=this;if(!p){p=v[1];}if(!w){w=v[2];}if(!s&&v[4]){s=v[4];}if(q&&o){u=f.getRegion(o);switch(w){case b.TOP_LEFT:r(u.top,u.left);break;case b.TOP_RIGHT:r(u.top,u.right);break;case b.BOTTOM_LEFT:r(u.bottom,u.left);break;case b.BOTTOM_RIGHT:r(u.bottom,u.right);break;}}}},enforceConstraints:function(p,o,q){var s=o[0];var r=this.getConstrainedXY(s[0],s[1]);this.cfg.setProperty("x",r[0],true);this.cfg.setProperty("y",r[1],true);this.cfg.setProperty("xy",r,true);},_getConstrainedPos:function(y,p){var t=this.element,r=b.VIEWPORT_OFFSET,A=(y=="x"),z=(A)?t.offsetWidth:t.offsetHeight,s=(A)?f.getViewportWidth():f.getViewportHeight(),D=(A)?f.getDocumentScrollLeft():f.getDocumentScrollTop(),C=(A)?b.PREVENT_OVERLAP_X:b.PREVENT_OVERLAP_Y,o=this.cfg.getProperty("context"),u=(z+r<s),w=this.cfg.getProperty("preventcontextoverlap")&&o&&C[(o[1]+o[2])],v=D+r,B=D+s-z-r,q=p;if(p<v||p>B){if(w){q=this._preventOverlap(y,o[0],z,s,D);}else{if(u){if(p<v){q=v;}else{if(p>B){q=B;}}}else{q=v;}}}return q;},_preventOverlap:function(y,w,z,u,C){var A=(y=="x"),t=b.VIEWPORT_OFFSET,s=this,q=((A)?f.getX(w):f.getY(w))-C,o=(A)?w.offsetWidth:w.offsetHeight,p=q-t,r=(u-(q+o))-t,D=false,v=function(){var x;if((s.cfg.getProperty(y)-C)>q){x=(q-z);}else{x=(q+o);}s.cfg.setProperty(y,(x+C),true);return x;},B=function(){var E=((s.cfg.getProperty(y)-C)>q)?r:p,x;if(z>E){if(D){v();}else{v();D=true;x=B();}}return x;};B();return this.cfg.getProperty(y);},getConstrainedX:function(o){return this._getConstrainedPos("x",o);},getConstrainedY:function(o){return this._getConstrainedPos("y",o);},getConstrainedXY:function(o,p){return[this.getConstrainedX(o),this.getConstrainedY(p)];},center:function(){var r=b.VIEWPORT_OFFSET,s=this.element.offsetWidth,q=this.element.offsetHeight,p=f.getViewportWidth(),t=f.getViewportHeight(),o,u;if(s<p){o=(p/2)-(s/2)+f.getDocumentScrollLeft();}else{o=r+f.getDocumentScrollLeft();}if(q<t){u=(t/2)-(q/2)+f.getDocumentScrollTop();}else{u=r+f.getDocumentScrollTop();}this.cfg.setProperty("xy",[parseInt(o,10),parseInt(u,10)]);this.cfg.refireEvent("iframe");if(k.webkit){this.forceContainerRedraw();}},syncPosition:function(){var o=f.getXY(this.element);
-this.cfg.setProperty("x",o[0],true);this.cfg.setProperty("y",o[1],true);this.cfg.setProperty("xy",o,true);},onDomResize:function(q,p){var o=this;b.superclass.onDomResize.call(this,q,p);setTimeout(function(){o.syncPosition();o.cfg.refireEvent("iframe");o.cfg.refireEvent("context");},0);},_getComputedHeight:(function(){if(document.defaultView&&document.defaultView.getComputedStyle){return function(p){var o=null;if(p.ownerDocument&&p.ownerDocument.defaultView){var q=p.ownerDocument.defaultView.getComputedStyle(p,"");if(q){o=parseInt(q.height,10);}}return(i.isNumber(o))?o:null;};}else{return function(p){var o=null;if(p.style.pixelHeight){o=p.style.pixelHeight;}return(i.isNumber(o))?o:null;};}})(),_validateAutoFillHeight:function(o){return(!o)||(i.isString(o)&&b.STD_MOD_RE.test(o));},_autoFillOnHeightChange:function(r,p,q){var o=this.cfg.getProperty("height");if((o&&o!=="auto")||(o===0)){this.fillHeight(q);}},_getPreciseHeight:function(p){var o=p.offsetHeight;if(p.getBoundingClientRect){var q=p.getBoundingClientRect();o=q.bottom-q.top;}return o;},fillHeight:function(r){if(r){var p=this.innerElement||this.element,o=[this.header,this.body,this.footer],v,w=0,x=0,t=0,q=false;for(var u=0,s=o.length;u<s;u++){v=o[u];if(v){if(r!==v){x+=this._getPreciseHeight(v);}else{q=true;}}}if(q){if(k.ie||k.opera){f.setStyle(r,"height",0+"px");}w=this._getComputedHeight(p);if(w===null){f.addClass(p,"yui-override-padding");w=p.clientHeight;f.removeClass(p,"yui-override-padding");}t=Math.max(w-x,0);f.setStyle(r,"height",t+"px");if(r.offsetHeight!=t){t=Math.max(t-(r.offsetHeight-t),0);}f.setStyle(r,"height",t+"px");}}},bringToTop:function(){var s=[],r=this.element;function v(z,y){var B=f.getStyle(z,"zIndex"),A=f.getStyle(y,"zIndex"),x=(!B||isNaN(B))?0:parseInt(B,10),w=(!A||isNaN(A))?0:parseInt(A,10);if(x>w){return -1;}else{if(x<w){return 1;}else{return 0;}}}function q(y){var x=f.hasClass(y,b.CSS_OVERLAY),w=YAHOO.widget.Panel;if(x&&!f.isAncestor(r,y)){if(w&&f.hasClass(y,w.CSS_PANEL)){s[s.length]=y.parentNode;}else{s[s.length]=y;}}}f.getElementsBy(q,"div",document.body);s.sort(v);var o=s[0],u;if(o){u=f.getStyle(o,"zIndex");if(!isNaN(u)){var t=false;if(o!=r){t=true;}else{if(s.length>1){var p=f.getStyle(s[1],"zIndex");if(!isNaN(p)&&(u==p)){t=true;}}}if(t){this.cfg.setProperty("zindex",(parseInt(u,10)+2));}}}},destroy:function(o){if(this.iframe){this.iframe.parentNode.removeChild(this.iframe);}this.iframe=null;b.windowResizeEvent.unsubscribe(this.doCenterOnDOMEvent,this);b.windowScrollEvent.unsubscribe(this.doCenterOnDOMEvent,this);g.textResizeEvent.unsubscribe(this._autoFillOnHeightChange);if(this._contextTriggers){this._processTriggers(this._contextTriggers,e,this._alignOnTrigger);}b.superclass.destroy.call(this,o);},forceContainerRedraw:function(){var o=this;f.addClass(o.element,"yui-force-redraw");setTimeout(function(){f.removeClass(o.element,"yui-force-redraw");},0);},toString:function(){return"Overlay "+this.id;}});}());(function(){YAHOO.widget.OverlayManager=function(g){this.init(g);};var d=YAHOO.widget.Overlay,c=YAHOO.util.Event,e=YAHOO.util.Dom,b=YAHOO.util.Config,f=YAHOO.util.CustomEvent,a=YAHOO.widget.OverlayManager;a.CSS_FOCUSED="focused";a.prototype={constructor:a,overlays:null,initDefaultConfig:function(){this.cfg.addProperty("overlays",{suppressEvent:true});this.cfg.addProperty("focusevent",{value:"mousedown"});},init:function(i){this.cfg=new b(this);this.initDefaultConfig();if(i){this.cfg.applyConfig(i,true);}this.cfg.fireQueue();var h=null;this.getActive=function(){return h;};this.focus=function(j){var k=this.find(j);if(k){k.focus();}};this.remove=function(k){var m=this.find(k),j;if(m){if(h==m){h=null;}var l=(m.element===null&&m.cfg===null)?true:false;if(!l){j=e.getStyle(m.element,"zIndex");m.cfg.setProperty("zIndex",-1000,true);}this.overlays.sort(this.compareZIndexDesc);this.overlays=this.overlays.slice(0,(this.overlays.length-1));m.hideEvent.unsubscribe(m.blur);m.destroyEvent.unsubscribe(this._onOverlayDestroy,m);m.focusEvent.unsubscribe(this._onOverlayFocusHandler,m);m.blurEvent.unsubscribe(this._onOverlayBlurHandler,m);if(!l){c.removeListener(m.element,this.cfg.getProperty("focusevent"),this._onOverlayElementFocus);m.cfg.setProperty("zIndex",j,true);m.cfg.setProperty("manager",null);}if(m.focusEvent._managed){m.focusEvent=null;}if(m.blurEvent._managed){m.blurEvent=null;}if(m.focus._managed){m.focus=null;}if(m.blur._managed){m.blur=null;}}};this.blurAll=function(){var k=this.overlays.length,j;if(k>0){j=k-1;do{this.overlays[j].blur();}while(j--);}};this._manageBlur=function(j){var k=false;if(h==j){e.removeClass(h.element,a.CSS_FOCUSED);h=null;k=true;}return k;};this._manageFocus=function(j){var k=false;if(h!=j){if(h){h.blur();}h=j;this.bringToTop(h);e.addClass(h.element,a.CSS_FOCUSED);k=true;}return k;};var g=this.cfg.getProperty("overlays");if(!this.overlays){this.overlays=[];}if(g){this.register(g);this.overlays.sort(this.compareZIndexDesc);}},_onOverlayElementFocus:function(i){var g=c.getTarget(i),h=this.close;if(h&&(g==h||e.isAncestor(h,g))){this.blur();}else{this.focus();}},_onOverlayDestroy:function(h,g,i){this.remove(i);},_onOverlayFocusHandler:function(h,g,i){this._manageFocus(i);},_onOverlayBlurHandler:function(h,g,i){this._manageBlur(i);},_bindFocus:function(g){var h=this;if(!g.focusEvent){g.focusEvent=g.createEvent("focus");g.focusEvent.signature=f.LIST;g.focusEvent._managed=true;}else{g.focusEvent.subscribe(h._onOverlayFocusHandler,g,h);}if(!g.focus){c.on(g.element,h.cfg.getProperty("focusevent"),h._onOverlayElementFocus,null,g);g.focus=function(){if(h._manageFocus(this)){if(this.cfg.getProperty("visible")&&this.focusFirst){this.focusFirst();}this.focusEvent.fire();}};g.focus._managed=true;}},_bindBlur:function(g){var h=this;if(!g.blurEvent){g.blurEvent=g.createEvent("blur");g.blurEvent.signature=f.LIST;g.focusEvent._managed=true;}else{g.blurEvent.subscribe(h._onOverlayBlurHandler,g,h);}if(!g.blur){g.blur=function(){if(h._manageBlur(this)){this.blurEvent.fire();}};g.blur._managed=true;}g.hideEvent.subscribe(g.blur);
-},_bindDestroy:function(g){var h=this;g.destroyEvent.subscribe(h._onOverlayDestroy,g,h);},_syncZIndex:function(g){var h=e.getStyle(g.element,"zIndex");if(!isNaN(h)){g.cfg.setProperty("zIndex",parseInt(h,10));}else{g.cfg.setProperty("zIndex",0);}},register:function(g){var k=false,h,j;if(g instanceof d){g.cfg.addProperty("manager",{value:this});this._bindFocus(g);this._bindBlur(g);this._bindDestroy(g);this._syncZIndex(g);this.overlays.push(g);this.bringToTop(g);k=true;}else{if(g instanceof Array){for(h=0,j=g.length;h<j;h++){k=this.register(g[h])||k;}}}return k;},bringToTop:function(m){var i=this.find(m),l,g,j;if(i){j=this.overlays;j.sort(this.compareZIndexDesc);g=j[0];if(g){l=e.getStyle(g.element,"zIndex");if(!isNaN(l)){var k=false;if(g!==i){k=true;}else{if(j.length>1){var h=e.getStyle(j[1].element,"zIndex");if(!isNaN(h)&&(l==h)){k=true;}}}if(k){i.cfg.setProperty("zindex",(parseInt(l,10)+2));}}j.sort(this.compareZIndexDesc);}}},find:function(g){var l=g instanceof d,j=this.overlays,p=j.length,k=null,m,h;if(l||typeof g=="string"){for(h=p-1;h>=0;h--){m=j[h];if((l&&(m===g))||(m.id==g)){k=m;break;}}}return k;},compareZIndexDesc:function(j,i){var h=(j.cfg)?j.cfg.getProperty("zIndex"):null,g=(i.cfg)?i.cfg.getProperty("zIndex"):null;if(h===null&&g===null){return 0;}else{if(h===null){return 1;}else{if(g===null){return -1;}else{if(h>g){return -1;}else{if(h<g){return 1;}else{return 0;}}}}}},showAll:function(){var h=this.overlays,j=h.length,g;for(g=j-1;g>=0;g--){h[g].show();}},hideAll:function(){var h=this.overlays,j=h.length,g;for(g=j-1;g>=0;g--){h[g].hide();}},toString:function(){return"OverlayManager";}};}());(function(){YAHOO.widget.Tooltip=function(p,o){YAHOO.widget.Tooltip.superclass.constructor.call(this,p,o);};var e=YAHOO.lang,n=YAHOO.util.Event,m=YAHOO.util.CustomEvent,c=YAHOO.util.Dom,j=YAHOO.widget.Tooltip,h=YAHOO.env.ua,g=(h.ie&&(h.ie<=6||document.compatMode=="BackCompat")),f,i={"PREVENT_OVERLAP":{key:"preventoverlap",value:true,validator:e.isBoolean,supercedes:["x","y","xy"]},"SHOW_DELAY":{key:"showdelay",value:200,validator:e.isNumber},"AUTO_DISMISS_DELAY":{key:"autodismissdelay",value:5000,validator:e.isNumber},"HIDE_DELAY":{key:"hidedelay",value:250,validator:e.isNumber},"TEXT":{key:"text",suppressEvent:true},"CONTAINER":{key:"container"},"DISABLED":{key:"disabled",value:false,suppressEvent:true},"XY_OFFSET":{key:"xyoffset",value:[0,25],suppressEvent:true}},a={"CONTEXT_MOUSE_OVER":"contextMouseOver","CONTEXT_MOUSE_OUT":"contextMouseOut","CONTEXT_TRIGGER":"contextTrigger"};j.CSS_TOOLTIP="yui-tt";function k(q,o){var p=this.cfg,r=p.getProperty("width");if(r==o){p.setProperty("width",q);}}function d(p,o){if("_originalWidth" in this){k.call(this,this._originalWidth,this._forcedWidth);}var q=document.body,u=this.cfg,t=u.getProperty("width"),r,s;if((!t||t=="auto")&&(u.getProperty("container")!=q||u.getProperty("x")>=c.getViewportWidth()||u.getProperty("y")>=c.getViewportHeight())){s=this.element.cloneNode(true);s.style.visibility="hidden";s.style.top="0px";s.style.left="0px";q.appendChild(s);r=(s.offsetWidth+"px");q.removeChild(s);s=null;u.setProperty("width",r);u.refireEvent("xy");this._originalWidth=t||"";this._forcedWidth=r;}}function b(p,o,q){this.render(q);}function l(){n.onDOMReady(b,this.cfg.getProperty("container"),this);}YAHOO.extend(j,YAHOO.widget.Overlay,{init:function(p,o){j.superclass.init.call(this,p);this.beforeInitEvent.fire(j);c.addClass(this.element,j.CSS_TOOLTIP);if(o){this.cfg.applyConfig(o,true);}this.cfg.queueProperty("visible",false);this.cfg.queueProperty("constraintoviewport",true);this.setBody("");this.subscribe("changeContent",d);this.subscribe("init",l);this.subscribe("render",this.onRender);this.initEvent.fire(j);},initEvents:function(){j.superclass.initEvents.call(this);var o=m.LIST;this.contextMouseOverEvent=this.createEvent(a.CONTEXT_MOUSE_OVER);this.contextMouseOverEvent.signature=o;this.contextMouseOutEvent=this.createEvent(a.CONTEXT_MOUSE_OUT);this.contextMouseOutEvent.signature=o;this.contextTriggerEvent=this.createEvent(a.CONTEXT_TRIGGER);this.contextTriggerEvent.signature=o;},initDefaultConfig:function(){j.superclass.initDefaultConfig.call(this);this.cfg.addProperty(i.PREVENT_OVERLAP.key,{value:i.PREVENT_OVERLAP.value,validator:i.PREVENT_OVERLAP.validator,supercedes:i.PREVENT_OVERLAP.supercedes});this.cfg.addProperty(i.SHOW_DELAY.key,{handler:this.configShowDelay,value:200,validator:i.SHOW_DELAY.validator});this.cfg.addProperty(i.AUTO_DISMISS_DELAY.key,{handler:this.configAutoDismissDelay,value:i.AUTO_DISMISS_DELAY.value,validator:i.AUTO_DISMISS_DELAY.validator});this.cfg.addProperty(i.HIDE_DELAY.key,{handler:this.configHideDelay,value:i.HIDE_DELAY.value,validator:i.HIDE_DELAY.validator});this.cfg.addProperty(i.TEXT.key,{handler:this.configText,suppressEvent:i.TEXT.suppressEvent});this.cfg.addProperty(i.CONTAINER.key,{handler:this.configContainer,value:document.body});this.cfg.addProperty(i.DISABLED.key,{handler:this.configContainer,value:i.DISABLED.value,supressEvent:i.DISABLED.suppressEvent});this.cfg.addProperty(i.XY_OFFSET.key,{value:i.XY_OFFSET.value.concat(),supressEvent:i.XY_OFFSET.suppressEvent});},configText:function(p,o,q){var r=o[0];if(r){this.setBody(r);}},configContainer:function(q,p,r){var o=p[0];if(typeof o=="string"){this.cfg.setProperty("container",document.getElementById(o),true);}},_removeEventListeners:function(){var r=this._context,o,q,p;if(r){o=r.length;if(o>0){p=o-1;do{q=r[p];n.removeListener(q,"mouseover",this.onContextMouseOver);n.removeListener(q,"mousemove",this.onContextMouseMove);n.removeListener(q,"mouseout",this.onContextMouseOut);}while(p--);}}},configContext:function(t,p,u){var s=p[0],v,o,r,q;if(s){if(!(s instanceof Array)){if(typeof s=="string"){this.cfg.setProperty("context",[document.getElementById(s)],true);}else{this.cfg.setProperty("context",[s],true);}s=this.cfg.getProperty("context");}this._removeEventListeners();this._context=s;v=this._context;if(v){o=v.length;if(o>0){q=o-1;do{r=v[q];n.on(r,"mouseover",this.onContextMouseOver,this);
-n.on(r,"mousemove",this.onContextMouseMove,this);n.on(r,"mouseout",this.onContextMouseOut,this);}while(q--);}}}},onContextMouseMove:function(p,o){o.pageX=n.getPageX(p);o.pageY=n.getPageY(p);},onContextMouseOver:function(q,p){var o=this;if(o.title){p._tempTitle=o.title;o.title="";}if(p.fireEvent("contextMouseOver",o,q)!==false&&!p.cfg.getProperty("disabled")){if(p.hideProcId){clearTimeout(p.hideProcId);p.hideProcId=null;}n.on(o,"mousemove",p.onContextMouseMove,p);p.showProcId=p.doShow(q,o);}},onContextMouseOut:function(q,p){var o=this;if(p._tempTitle){o.title=p._tempTitle;p._tempTitle=null;}if(p.showProcId){clearTimeout(p.showProcId);p.showProcId=null;}if(p.hideProcId){clearTimeout(p.hideProcId);p.hideProcId=null;}p.fireEvent("contextMouseOut",o,q);p.hideProcId=setTimeout(function(){p.hide();},p.cfg.getProperty("hidedelay"));},doShow:function(r,o){var t=this.cfg.getProperty("xyoffset"),p=t[0],s=t[1],q=this;if(h.opera&&o.tagName&&o.tagName.toUpperCase()=="A"){s+=12;}return setTimeout(function(){var u=q.cfg.getProperty("text");if(q._tempTitle&&(u===""||YAHOO.lang.isUndefined(u)||YAHOO.lang.isNull(u))){q.setBody(q._tempTitle);}else{q.cfg.refireEvent("text");}q.moveTo(q.pageX+p,q.pageY+s);if(q.cfg.getProperty("preventoverlap")){q.preventOverlap(q.pageX,q.pageY);}n.removeListener(o,"mousemove",q.onContextMouseMove);q.contextTriggerEvent.fire(o);q.show();q.hideProcId=q.doHide();},this.cfg.getProperty("showdelay"));},doHide:function(){var o=this;return setTimeout(function(){o.hide();},this.cfg.getProperty("autodismissdelay"));},preventOverlap:function(s,r){var o=this.element.offsetHeight,q=new YAHOO.util.Point(s,r),p=c.getRegion(this.element);p.top-=5;p.left-=5;p.right+=5;p.bottom+=5;if(p.contains(q)){this.cfg.setProperty("y",(r-o-5));}},onRender:function(s,r){function t(){var w=this.element,v=this.underlay;if(v){v.style.width=(w.offsetWidth+6)+"px";v.style.height=(w.offsetHeight+1)+"px";}}function p(){c.addClass(this.underlay,"yui-tt-shadow-visible");if(h.ie){this.forceUnderlayRedraw();}}function o(){c.removeClass(this.underlay,"yui-tt-shadow-visible");}function u(){var x=this.underlay,w,v,z,y;if(!x){w=this.element;v=YAHOO.widget.Module;z=h.ie;y=this;if(!f){f=document.createElement("div");f.className="yui-tt-shadow";}x=f.cloneNode(false);w.appendChild(x);this.underlay=x;this._shadow=this.underlay;p.call(this);this.subscribe("beforeShow",p);this.subscribe("hide",o);if(g){window.setTimeout(function(){t.call(y);},0);this.cfg.subscribeToConfigEvent("width",t);this.cfg.subscribeToConfigEvent("height",t);this.subscribe("changeContent",t);v.textResizeEvent.subscribe(t,this,true);this.subscribe("destroy",function(){v.textResizeEvent.unsubscribe(t,this);});}}}function q(){u.call(this);this.unsubscribe("beforeShow",q);}if(this.cfg.getProperty("visible")){u.call(this);}else{this.subscribe("beforeShow",q);}},forceUnderlayRedraw:function(){var o=this;c.addClass(o.underlay,"yui-force-redraw");setTimeout(function(){c.removeClass(o.underlay,"yui-force-redraw");},0);},destroy:function(){this._removeEventListeners();j.superclass.destroy.call(this);},toString:function(){return"Tooltip "+this.id;}});}());(function(){YAHOO.widget.Panel=function(v,u){YAHOO.widget.Panel.superclass.constructor.call(this,v,u);};var s=null;var e=YAHOO.lang,f=YAHOO.util,a=f.Dom,t=f.Event,m=f.CustomEvent,k=YAHOO.util.KeyListener,i=f.Config,h=YAHOO.widget.Overlay,o=YAHOO.widget.Panel,l=YAHOO.env.ua,p=(l.ie&&(l.ie<=6||document.compatMode=="BackCompat")),g,q,c,d={"BEFORE_SHOW_MASK":"beforeShowMask","BEFORE_HIDE_MASK":"beforeHideMask","SHOW_MASK":"showMask","HIDE_MASK":"hideMask","DRAG":"drag"},n={"CLOSE":{key:"close",value:true,validator:e.isBoolean,supercedes:["visible"]},"DRAGGABLE":{key:"draggable",value:(f.DD?true:false),validator:e.isBoolean,supercedes:["visible"]},"DRAG_ONLY":{key:"dragonly",value:false,validator:e.isBoolean,supercedes:["draggable"]},"UNDERLAY":{key:"underlay",value:"shadow",supercedes:["visible"]},"MODAL":{key:"modal",value:false,validator:e.isBoolean,supercedes:["visible","zindex"]},"KEY_LISTENERS":{key:"keylisteners",suppressEvent:true,supercedes:["visible"]},"STRINGS":{key:"strings",supercedes:["close"],validator:e.isObject,value:{close:"Close"}}};o.CSS_PANEL="yui-panel";o.CSS_PANEL_CONTAINER="yui-panel-container";o.FOCUSABLE=["a","button","select","textarea","input","iframe"];function j(v,u){if(!this.header&&this.cfg.getProperty("draggable")){this.setHeader("&#160;");}}function r(v,u,w){var z=w[0],x=w[1],y=this.cfg,A=y.getProperty("width");if(A==x){y.setProperty("width",z);}this.unsubscribe("hide",r,w);}function b(v,u){var y,x,w;if(p){y=this.cfg;x=y.getProperty("width");if(!x||x=="auto"){w=(this.element.offsetWidth+"px");y.setProperty("width",w);this.subscribe("hide",r,[(x||""),w]);}}}YAHOO.extend(o,h,{init:function(v,u){o.superclass.init.call(this,v);this.beforeInitEvent.fire(o);a.addClass(this.element,o.CSS_PANEL);this.buildWrapper();if(u){this.cfg.applyConfig(u,true);}this.subscribe("showMask",this._addFocusHandlers);this.subscribe("hideMask",this._removeFocusHandlers);this.subscribe("beforeRender",j);this.subscribe("render",function(){this.setFirstLastFocusable();this.subscribe("changeContent",this.setFirstLastFocusable);});this.subscribe("show",this._focusOnShow);this.initEvent.fire(o);},_onElementFocus:function(z){if(s===this){var y=t.getTarget(z),x=document.documentElement,v=(y!==x&&y!==window);if(v&&y!==this.element&&y!==this.mask&&!a.isAncestor(this.element,y)){try{this._focusFirstModal();}catch(w){try{if(v&&y!==document.body){y.blur();}}catch(u){}}}}},_focusFirstModal:function(){var u=this.firstElement;if(u){u.focus();}else{if(this._modalFocus){this._modalFocus.focus();}else{this.innerElement.focus();}}},_addFocusHandlers:function(v,u){if(!this.firstElement){if(l.webkit||l.opera){if(!this._modalFocus){this._createHiddenFocusElement();}}else{this.innerElement.tabIndex=0;}}this._setTabLoop(this.firstElement,this.lastElement);t.onFocus(document.documentElement,this._onElementFocus,this,true);s=this;},_createHiddenFocusElement:function(){var u=document.createElement("button");
-u.style.height="1px";u.style.width="1px";u.style.position="absolute";u.style.left="-10000em";u.style.opacity=0;u.tabIndex=-1;this.innerElement.appendChild(u);this._modalFocus=u;},_removeFocusHandlers:function(v,u){t.removeFocusListener(document.documentElement,this._onElementFocus,this);if(s==this){s=null;}},_focusOnShow:function(v,u,w){if(u&&u[1]){t.stopEvent(u[1]);}if(!this.focusFirst(v,u,w)){if(this.cfg.getProperty("modal")){this._focusFirstModal();}}},focusFirst:function(w,u,z){var v=this.firstElement,y=false;if(u&&u[1]){t.stopEvent(u[1]);}if(v){try{v.focus();y=true;}catch(x){}}return y;},focusLast:function(w,u,z){var v=this.lastElement,y=false;if(u&&u[1]){t.stopEvent(u[1]);}if(v){try{v.focus();y=true;}catch(x){}}return y;},_setTabLoop:function(u,v){this.setTabLoop(u,v);},setTabLoop:function(x,z){var v=this.preventBackTab,w=this.preventTabOut,u=this.showEvent,y=this.hideEvent;if(v){v.disable();u.unsubscribe(v.enable,v);y.unsubscribe(v.disable,v);v=this.preventBackTab=null;}if(w){w.disable();u.unsubscribe(w.enable,w);y.unsubscribe(w.disable,w);w=this.preventTabOut=null;}if(x){this.preventBackTab=new k(x,{shift:true,keys:9},{fn:this.focusLast,scope:this,correctScope:true});v=this.preventBackTab;u.subscribe(v.enable,v,true);y.subscribe(v.disable,v,true);}if(z){this.preventTabOut=new k(z,{shift:false,keys:9},{fn:this.focusFirst,scope:this,correctScope:true});w=this.preventTabOut;u.subscribe(w.enable,w,true);y.subscribe(w.disable,w,true);}},getFocusableElements:function(v){v=v||this.innerElement;var x={},u=this;for(var w=0;w<o.FOCUSABLE.length;w++){x[o.FOCUSABLE[w]]=true;}return a.getElementsBy(function(y){return u._testIfFocusable(y,x);},null,v);},_testIfFocusable:function(u,v){if(u.focus&&u.type!=="hidden"&&!u.disabled&&v[u.tagName.toLowerCase()]){return true;}return false;},setFirstLastFocusable:function(){this.firstElement=null;this.lastElement=null;var u=this.getFocusableElements();this.focusableElements=u;if(u.length>0){this.firstElement=u[0];this.lastElement=u[u.length-1];}if(this.cfg.getProperty("modal")){this._setTabLoop(this.firstElement,this.lastElement);}},initEvents:function(){o.superclass.initEvents.call(this);var u=m.LIST;this.showMaskEvent=this.createEvent(d.SHOW_MASK);this.showMaskEvent.signature=u;this.beforeShowMaskEvent=this.createEvent(d.BEFORE_SHOW_MASK);this.beforeShowMaskEvent.signature=u;this.hideMaskEvent=this.createEvent(d.HIDE_MASK);this.hideMaskEvent.signature=u;this.beforeHideMaskEvent=this.createEvent(d.BEFORE_HIDE_MASK);this.beforeHideMaskEvent.signature=u;this.dragEvent=this.createEvent(d.DRAG);this.dragEvent.signature=u;},initDefaultConfig:function(){o.superclass.initDefaultConfig.call(this);this.cfg.addProperty(n.CLOSE.key,{handler:this.configClose,value:n.CLOSE.value,validator:n.CLOSE.validator,supercedes:n.CLOSE.supercedes});this.cfg.addProperty(n.DRAGGABLE.key,{handler:this.configDraggable,value:(f.DD)?true:false,validator:n.DRAGGABLE.validator,supercedes:n.DRAGGABLE.supercedes});this.cfg.addProperty(n.DRAG_ONLY.key,{value:n.DRAG_ONLY.value,validator:n.DRAG_ONLY.validator,supercedes:n.DRAG_ONLY.supercedes});this.cfg.addProperty(n.UNDERLAY.key,{handler:this.configUnderlay,value:n.UNDERLAY.value,supercedes:n.UNDERLAY.supercedes});this.cfg.addProperty(n.MODAL.key,{handler:this.configModal,value:n.MODAL.value,validator:n.MODAL.validator,supercedes:n.MODAL.supercedes});this.cfg.addProperty(n.KEY_LISTENERS.key,{handler:this.configKeyListeners,suppressEvent:n.KEY_LISTENERS.suppressEvent,supercedes:n.KEY_LISTENERS.supercedes});this.cfg.addProperty(n.STRINGS.key,{value:n.STRINGS.value,handler:this.configStrings,validator:n.STRINGS.validator,supercedes:n.STRINGS.supercedes});},configClose:function(y,v,z){var A=v[0],x=this.close,u=this.cfg.getProperty("strings"),w;if(A){if(!x){if(!c){c=document.createElement("a");c.className="container-close";c.href="#";}x=c.cloneNode(true);w=this.innerElement.firstChild;if(w){this.innerElement.insertBefore(x,w);}else{this.innerElement.appendChild(x);}x.innerHTML=(u&&u.close)?u.close:"&#160;";t.on(x,"click",this._doClose,this,true);this.close=x;}else{x.style.display="block";}}else{if(x){x.style.display="none";}}},_doClose:function(u){t.preventDefault(u);this.hide();},configDraggable:function(v,u,w){var x=u[0];if(x){if(!f.DD){this.cfg.setProperty("draggable",false);return;}if(this.header){a.setStyle(this.header,"cursor","move");this.registerDragDrop();}this.subscribe("beforeShow",b);}else{if(this.dd){this.dd.unreg();}if(this.header){a.setStyle(this.header,"cursor","auto");}this.unsubscribe("beforeShow",b);}},configUnderlay:function(D,C,z){var B=(this.platform=="mac"&&l.gecko),E=C[0].toLowerCase(),v=this.underlay,w=this.element;function x(){var F=false;if(!v){if(!q){q=document.createElement("div");q.className="underlay";}v=q.cloneNode(false);this.element.appendChild(v);this.underlay=v;if(p){this.sizeUnderlay();this.cfg.subscribeToConfigEvent("width",this.sizeUnderlay);this.cfg.subscribeToConfigEvent("height",this.sizeUnderlay);this.changeContentEvent.subscribe(this.sizeUnderlay);YAHOO.widget.Module.textResizeEvent.subscribe(this.sizeUnderlay,this,true);}if(l.webkit&&l.webkit<420){this.changeContentEvent.subscribe(this.forceUnderlayRedraw);}F=true;}}function A(){var F=x.call(this);if(!F&&p){this.sizeUnderlay();}this._underlayDeferred=false;this.beforeShowEvent.unsubscribe(A);}function y(){if(this._underlayDeferred){this.beforeShowEvent.unsubscribe(A);this._underlayDeferred=false;}if(v){this.cfg.unsubscribeFromConfigEvent("width",this.sizeUnderlay);this.cfg.unsubscribeFromConfigEvent("height",this.sizeUnderlay);this.changeContentEvent.unsubscribe(this.sizeUnderlay);this.changeContentEvent.unsubscribe(this.forceUnderlayRedraw);YAHOO.widget.Module.textResizeEvent.unsubscribe(this.sizeUnderlay,this,true);this.element.removeChild(v);this.underlay=null;}}switch(E){case"shadow":a.removeClass(w,"matte");a.addClass(w,"shadow");break;case"matte":if(!B){y.call(this);}a.removeClass(w,"shadow");a.addClass(w,"matte");break;default:if(!B){y.call(this);
-}a.removeClass(w,"shadow");a.removeClass(w,"matte");break;}if((E=="shadow")||(B&&!v)){if(this.cfg.getProperty("visible")){var u=x.call(this);if(!u&&p){this.sizeUnderlay();}}else{if(!this._underlayDeferred){this.beforeShowEvent.subscribe(A);this._underlayDeferred=true;}}}},configModal:function(v,u,x){var w=u[0];if(w){if(!this._hasModalityEventListeners){this.subscribe("beforeShow",this.buildMask);this.subscribe("beforeShow",this.bringToTop);this.subscribe("beforeShow",this.showMask);this.subscribe("hide",this.hideMask);h.windowResizeEvent.subscribe(this.sizeMask,this,true);this._hasModalityEventListeners=true;}}else{if(this._hasModalityEventListeners){if(this.cfg.getProperty("visible")){this.hideMask();this.removeMask();}this.unsubscribe("beforeShow",this.buildMask);this.unsubscribe("beforeShow",this.bringToTop);this.unsubscribe("beforeShow",this.showMask);this.unsubscribe("hide",this.hideMask);h.windowResizeEvent.unsubscribe(this.sizeMask,this);this._hasModalityEventListeners=false;}}},removeMask:function(){var v=this.mask,u;if(v){this.hideMask();u=v.parentNode;if(u){u.removeChild(v);}this.mask=null;}},configKeyListeners:function(x,u,A){var w=u[0],z,y,v;if(w){if(w instanceof Array){y=w.length;for(v=0;v<y;v++){z=w[v];if(!i.alreadySubscribed(this.showEvent,z.enable,z)){this.showEvent.subscribe(z.enable,z,true);}if(!i.alreadySubscribed(this.hideEvent,z.disable,z)){this.hideEvent.subscribe(z.disable,z,true);this.destroyEvent.subscribe(z.disable,z,true);}}}else{if(!i.alreadySubscribed(this.showEvent,w.enable,w)){this.showEvent.subscribe(w.enable,w,true);}if(!i.alreadySubscribed(this.hideEvent,w.disable,w)){this.hideEvent.subscribe(w.disable,w,true);this.destroyEvent.subscribe(w.disable,w,true);}}}},configStrings:function(v,u,w){var x=e.merge(n.STRINGS.value,u[0]);this.cfg.setProperty(n.STRINGS.key,x,true);},configHeight:function(x,v,y){var u=v[0],w=this.innerElement;a.setStyle(w,"height",u);this.cfg.refireEvent("iframe");},_autoFillOnHeightChange:function(x,v,w){o.superclass._autoFillOnHeightChange.apply(this,arguments);if(p){var u=this;setTimeout(function(){u.sizeUnderlay();},0);}},configWidth:function(x,u,y){var w=u[0],v=this.innerElement;a.setStyle(v,"width",w);this.cfg.refireEvent("iframe");},configzIndex:function(v,u,x){o.superclass.configzIndex.call(this,v,u,x);if(this.mask||this.cfg.getProperty("modal")===true){var w=a.getStyle(this.element,"zIndex");if(!w||isNaN(w)){w=0;}if(w===0){this.cfg.setProperty("zIndex",1);}else{this.stackMask();}}},buildWrapper:function(){var w=this.element.parentNode,u=this.element,v=document.createElement("div");v.className=o.CSS_PANEL_CONTAINER;v.id=u.id+"_c";if(w){w.insertBefore(v,u);}v.appendChild(u);this.element=v;this.innerElement=u;a.setStyle(this.innerElement,"visibility","inherit");},sizeUnderlay:function(){var v=this.underlay,u;if(v){u=this.element;v.style.width=u.offsetWidth+"px";v.style.height=u.offsetHeight+"px";}},registerDragDrop:function(){var v=this;if(this.header){if(!f.DD){return;}var u=(this.cfg.getProperty("dragonly")===true);this.dd=new f.DD(this.element.id,this.id,{dragOnly:u});if(!this.header.id){this.header.id=this.id+"_h";}this.dd.startDrag=function(){var x,z,w,C,B,A;if(YAHOO.env.ua.ie==6){a.addClass(v.element,"drag");}if(v.cfg.getProperty("constraintoviewport")){var y=h.VIEWPORT_OFFSET;x=v.element.offsetHeight;z=v.element.offsetWidth;w=a.getViewportWidth();C=a.getViewportHeight();B=a.getDocumentScrollLeft();A=a.getDocumentScrollTop();if(x+y<C){this.minY=A+y;this.maxY=A+C-x-y;}else{this.minY=A+y;this.maxY=A+y;}if(z+y<w){this.minX=B+y;this.maxX=B+w-z-y;}else{this.minX=B+y;this.maxX=B+y;}this.constrainX=true;this.constrainY=true;}else{this.constrainX=false;this.constrainY=false;}v.dragEvent.fire("startDrag",arguments);};this.dd.onDrag=function(){v.syncPosition();v.cfg.refireEvent("iframe");if(this.platform=="mac"&&YAHOO.env.ua.gecko){this.showMacGeckoScrollbars();}v.dragEvent.fire("onDrag",arguments);};this.dd.endDrag=function(){if(YAHOO.env.ua.ie==6){a.removeClass(v.element,"drag");}v.dragEvent.fire("endDrag",arguments);v.moveEvent.fire(v.cfg.getProperty("xy"));};this.dd.setHandleElId(this.header.id);this.dd.addInvalidHandleType("INPUT");this.dd.addInvalidHandleType("SELECT");this.dd.addInvalidHandleType("TEXTAREA");}},buildMask:function(){var u=this.mask;if(!u){if(!g){g=document.createElement("div");g.className="mask";g.innerHTML="&#160;";}u=g.cloneNode(true);u.id=this.id+"_mask";document.body.insertBefore(u,document.body.firstChild);this.mask=u;if(YAHOO.env.ua.gecko&&this.platform=="mac"){a.addClass(this.mask,"block-scrollbars");}this.stackMask();}},hideMask:function(){if(this.cfg.getProperty("modal")&&this.mask&&this.beforeHideMaskEvent.fire()){this.mask.style.display="none";a.removeClass(document.body,"masked");this.hideMaskEvent.fire();}},showMask:function(){if(this.cfg.getProperty("modal")&&this.mask&&this.beforeShowMaskEvent.fire()){a.addClass(document.body,"masked");this.sizeMask();this.mask.style.display="block";this.showMaskEvent.fire();}},sizeMask:function(){if(this.mask){var v=this.mask,w=a.getViewportWidth(),u=a.getViewportHeight();if(v.offsetHeight>u){v.style.height=u+"px";}if(v.offsetWidth>w){v.style.width=w+"px";}v.style.height=a.getDocumentHeight()+"px";v.style.width=a.getDocumentWidth()+"px";}},stackMask:function(){if(this.mask){var u=a.getStyle(this.element,"zIndex");if(!YAHOO.lang.isUndefined(u)&&!isNaN(u)){a.setStyle(this.mask,"zIndex",u-1);}}},render:function(u){return o.superclass.render.call(this,u,this.innerElement);},_renderHeader:function(u){u=u||this.innerElement;o.superclass._renderHeader.call(this,u);},_renderBody:function(u){u=u||this.innerElement;o.superclass._renderBody.call(this,u);},_renderFooter:function(u){u=u||this.innerElement;o.superclass._renderFooter.call(this,u);},destroy:function(u){h.windowResizeEvent.unsubscribe(this.sizeMask,this);this.removeMask();if(this.close){t.purgeElement(this.close);}o.superclass.destroy.call(this,u);},forceUnderlayRedraw:function(){var v=this.underlay;a.addClass(v,"yui-force-redraw");
-setTimeout(function(){a.removeClass(v,"yui-force-redraw");},0);},toString:function(){return"Panel "+this.id;}});}());(function(){YAHOO.widget.Dialog=function(j,i){YAHOO.widget.Dialog.superclass.constructor.call(this,j,i);};var b=YAHOO.util.Event,g=YAHOO.util.CustomEvent,e=YAHOO.util.Dom,a=YAHOO.widget.Dialog,f=YAHOO.lang,h={"BEFORE_SUBMIT":"beforeSubmit","SUBMIT":"submit","MANUAL_SUBMIT":"manualSubmit","ASYNC_SUBMIT":"asyncSubmit","FORM_SUBMIT":"formSubmit","CANCEL":"cancel"},c={"POST_METHOD":{key:"postmethod",value:"async"},"POST_DATA":{key:"postdata",value:null},"BUTTONS":{key:"buttons",value:"none",supercedes:["visible"]},"HIDEAFTERSUBMIT":{key:"hideaftersubmit",value:true}};a.CSS_DIALOG="yui-dialog";function d(){var m=this._aButtons,k,l,j;if(f.isArray(m)){k=m.length;if(k>0){j=k-1;do{l=m[j];if(YAHOO.widget.Button&&l instanceof YAHOO.widget.Button){l.destroy();}else{if(l.tagName.toUpperCase()=="BUTTON"){b.purgeElement(l);b.purgeElement(l,false);}}}while(j--);}}}YAHOO.extend(a,YAHOO.widget.Panel,{form:null,initDefaultConfig:function(){a.superclass.initDefaultConfig.call(this);this.callback={success:null,failure:null,argument:null};this.cfg.addProperty(c.POST_METHOD.key,{handler:this.configPostMethod,value:c.POST_METHOD.value,validator:function(i){if(i!="form"&&i!="async"&&i!="none"&&i!="manual"){return false;}else{return true;}}});this.cfg.addProperty(c.POST_DATA.key,{value:c.POST_DATA.value});this.cfg.addProperty(c.HIDEAFTERSUBMIT.key,{value:c.HIDEAFTERSUBMIT.value});this.cfg.addProperty(c.BUTTONS.key,{handler:this.configButtons,value:c.BUTTONS.value,supercedes:c.BUTTONS.supercedes});},initEvents:function(){a.superclass.initEvents.call(this);var i=g.LIST;this.beforeSubmitEvent=this.createEvent(h.BEFORE_SUBMIT);this.beforeSubmitEvent.signature=i;this.submitEvent=this.createEvent(h.SUBMIT);this.submitEvent.signature=i;this.manualSubmitEvent=this.createEvent(h.MANUAL_SUBMIT);this.manualSubmitEvent.signature=i;this.asyncSubmitEvent=this.createEvent(h.ASYNC_SUBMIT);this.asyncSubmitEvent.signature=i;this.formSubmitEvent=this.createEvent(h.FORM_SUBMIT);this.formSubmitEvent.signature=i;this.cancelEvent=this.createEvent(h.CANCEL);this.cancelEvent.signature=i;},init:function(j,i){a.superclass.init.call(this,j);this.beforeInitEvent.fire(a);e.addClass(this.element,a.CSS_DIALOG);this.cfg.setProperty("visible",false);if(i){this.cfg.applyConfig(i,true);}this.beforeHideEvent.subscribe(this.blurButtons,this,true);this.subscribe("changeBody",this.registerForm);this.initEvent.fire(a);},doSubmit:function(){var q=YAHOO.util.Connect,r=this.form,l=false,o=false,s,n,m,j;switch(this.cfg.getProperty("postmethod")){case"async":s=r.elements;n=s.length;if(n>0){m=n-1;do{if(s[m].type=="file"){l=true;break;}}while(m--);}if(l&&YAHOO.env.ua.ie&&this.isSecure){o=true;}j=this._getFormAttributes(r);q.setForm(r,l,o);var k=this.cfg.getProperty("postdata");var p=q.asyncRequest(j.method,j.action,this.callback,k);this.asyncSubmitEvent.fire(p);break;case"form":r.submit();this.formSubmitEvent.fire();break;case"none":case"manual":this.manualSubmitEvent.fire();break;}},_getFormAttributes:function(k){var i={method:null,action:null};if(k){if(k.getAttributeNode){var j=k.getAttributeNode("action");var l=k.getAttributeNode("method");if(j){i.action=j.value;}if(l){i.method=l.value;}}else{i.action=k.getAttribute("action");i.method=k.getAttribute("method");}}i.method=(f.isString(i.method)?i.method:"POST").toUpperCase();i.action=f.isString(i.action)?i.action:"";return i;},registerForm:function(){var i=this.element.getElementsByTagName("form")[0];if(this.form){if(this.form==i&&e.isAncestor(this.element,this.form)){return;}else{b.purgeElement(this.form);this.form=null;}}if(!i){i=document.createElement("form");i.name="frm_"+this.id;this.body.appendChild(i);}if(i){this.form=i;b.on(i,"submit",this._submitHandler,this,true);}},_submitHandler:function(i){b.stopEvent(i);this.submit();this.form.blur();},setTabLoop:function(i,j){i=i||this.firstButton;j=j||this.lastButton;a.superclass.setTabLoop.call(this,i,j);},_setTabLoop:function(i,j){i=i||this.firstButton;j=this.lastButton||j;this.setTabLoop(i,j);},setFirstLastFocusable:function(){a.superclass.setFirstLastFocusable.call(this);var k,j,m,n=this.focusableElements;this.firstFormElement=null;this.lastFormElement=null;if(this.form&&n&&n.length>0){j=n.length;for(k=0;k<j;++k){m=n[k];if(this.form===m.form){this.firstFormElement=m;break;}}for(k=j-1;k>=0;--k){m=n[k];if(this.form===m.form){this.lastFormElement=m;break;}}}},configClose:function(j,i,k){a.superclass.configClose.apply(this,arguments);},_doClose:function(i){b.preventDefault(i);this.cancel();},configButtons:function(t,s,n){var o=YAHOO.widget.Button,v=s[0],l=this.innerElement,u,q,k,r,p,j,m;d.call(this);this._aButtons=null;if(f.isArray(v)){p=document.createElement("span");p.className="button-group";r=v.length;this._aButtons=[];this.defaultHtmlButton=null;for(m=0;m<r;m++){u=v[m];if(o){k=new o({label:u.text,type:u.type});k.appendTo(p);q=k.get("element");if(u.isDefault){k.addClass("default");this.defaultHtmlButton=q;}if(f.isFunction(u.handler)){k.set("onclick",{fn:u.handler,obj:this,scope:this});}else{if(f.isObject(u.handler)&&f.isFunction(u.handler.fn)){k.set("onclick",{fn:u.handler.fn,obj:((!f.isUndefined(u.handler.obj))?u.handler.obj:this),scope:(u.handler.scope||this)});}}this._aButtons[this._aButtons.length]=k;}else{q=document.createElement("button");q.setAttribute("type","button");if(u.isDefault){q.className="default";this.defaultHtmlButton=q;}q.innerHTML=u.text;if(f.isFunction(u.handler)){b.on(q,"click",u.handler,this,true);}else{if(f.isObject(u.handler)&&f.isFunction(u.handler.fn)){b.on(q,"click",u.handler.fn,((!f.isUndefined(u.handler.obj))?u.handler.obj:this),(u.handler.scope||this));}}p.appendChild(q);this._aButtons[this._aButtons.length]=q;}u.htmlButton=q;if(m===0){this.firstButton=q;}if(m==(r-1)){this.lastButton=q;}}this.setFooter(p);j=this.footer;if(e.inDocument(this.element)&&!e.isAncestor(l,j)){l.appendChild(j);}this.buttonSpan=p;}else{p=this.buttonSpan;
-j=this.footer;if(p&&j){j.removeChild(p);this.buttonSpan=null;this.firstButton=null;this.lastButton=null;this.defaultHtmlButton=null;}}this.changeContentEvent.fire();},getButtons:function(){return this._aButtons||null;},focusFirst:function(k,i,n){var j=this.firstFormElement,m=false;if(i&&i[1]){b.stopEvent(i[1]);if(i[0]===9&&this.firstElement){j=this.firstElement;}}if(j){try{j.focus();m=true;}catch(l){}}else{if(this.defaultHtmlButton){m=this.focusDefaultButton();}else{m=this.focusFirstButton();}}return m;},focusLast:function(k,i,n){var o=this.cfg.getProperty("buttons"),j=this.lastFormElement,m=false;if(i&&i[1]){b.stopEvent(i[1]);if(i[0]===9&&this.lastElement){j=this.lastElement;}}if(o&&f.isArray(o)){m=this.focusLastButton();}else{if(j){try{j.focus();m=true;}catch(l){}}}return m;},_getButton:function(j){var i=YAHOO.widget.Button;if(i&&j&&j.nodeName&&j.id){j=i.getButton(j.id)||j;}return j;},focusDefaultButton:function(){var i=this._getButton(this.defaultHtmlButton),k=false;if(i){try{i.focus();k=true;}catch(j){}}return k;},blurButtons:function(){var o=this.cfg.getProperty("buttons"),l,n,k,j;if(o&&f.isArray(o)){l=o.length;if(l>0){j=(l-1);do{n=o[j];if(n){k=this._getButton(n.htmlButton);if(k){try{k.blur();}catch(m){}}}}while(j--);}}},focusFirstButton:function(){var m=this.cfg.getProperty("buttons"),k,i,l=false;if(m&&f.isArray(m)){k=m[0];if(k){i=this._getButton(k.htmlButton);if(i){try{i.focus();l=true;}catch(j){}}}}return l;},focusLastButton:function(){var n=this.cfg.getProperty("buttons"),j,l,i,m=false;if(n&&f.isArray(n)){j=n.length;if(j>0){l=n[(j-1)];if(l){i=this._getButton(l.htmlButton);if(i){try{i.focus();m=true;}catch(k){}}}}}return m;},configPostMethod:function(j,i,k){this.registerForm();},validate:function(){return true;},submit:function(){if(this.validate()){if(this.beforeSubmitEvent.fire()){this.doSubmit();this.submitEvent.fire();if(this.cfg.getProperty("hideaftersubmit")){this.hide();}return true;}else{return false;}}else{return false;}},cancel:function(){this.cancelEvent.fire();this.hide();},getData:function(){var A=this.form,k,t,w,m,u,r,q,j,x,l,y,B,p,C,o,z,v;function s(n){var i=n.tagName.toUpperCase();return((i=="INPUT"||i=="TEXTAREA"||i=="SELECT")&&n.name==m);}if(A){k=A.elements;t=k.length;w={};for(z=0;z<t;z++){m=k[z].name;u=e.getElementsBy(s,"*",A);r=u.length;if(r>0){if(r==1){u=u[0];q=u.type;j=u.tagName.toUpperCase();switch(j){case"INPUT":if(q=="checkbox"){w[m]=u.checked;}else{if(q!="radio"){w[m]=u.value;}}break;case"TEXTAREA":w[m]=u.value;break;case"SELECT":x=u.options;l=x.length;y=[];for(v=0;v<l;v++){B=x[v];if(B.selected){o=B.attributes.value;y[y.length]=(o&&o.specified)?B.value:B.text;}}w[m]=y;break;}}else{q=u[0].type;switch(q){case"radio":for(v=0;v<r;v++){p=u[v];if(p.checked){w[m]=p.value;break;}}break;case"checkbox":y=[];for(v=0;v<r;v++){C=u[v];if(C.checked){y[y.length]=C.value;}}w[m]=y;break;}}}}}return w;},destroy:function(i){d.call(this);this._aButtons=null;var j=this.element.getElementsByTagName("form"),k;if(j.length>0){k=j[0];if(k){b.purgeElement(k);if(k.parentNode){k.parentNode.removeChild(k);}this.form=null;}}a.superclass.destroy.call(this,i);},toString:function(){return"Dialog "+this.id;}});}());(function(){YAHOO.widget.SimpleDialog=function(e,d){YAHOO.widget.SimpleDialog.superclass.constructor.call(this,e,d);};var c=YAHOO.util.Dom,b=YAHOO.widget.SimpleDialog,a={"ICON":{key:"icon",value:"none",suppressEvent:true},"TEXT":{key:"text",value:"",suppressEvent:true,supercedes:["icon"]}};b.ICON_BLOCK="blckicon";b.ICON_ALARM="alrticon";b.ICON_HELP="hlpicon";b.ICON_INFO="infoicon";b.ICON_WARN="warnicon";b.ICON_TIP="tipicon";b.ICON_CSS_CLASSNAME="yui-icon";b.CSS_SIMPLEDIALOG="yui-simple-dialog";YAHOO.extend(b,YAHOO.widget.Dialog,{initDefaultConfig:function(){b.superclass.initDefaultConfig.call(this);this.cfg.addProperty(a.ICON.key,{handler:this.configIcon,value:a.ICON.value,suppressEvent:a.ICON.suppressEvent});this.cfg.addProperty(a.TEXT.key,{handler:this.configText,value:a.TEXT.value,suppressEvent:a.TEXT.suppressEvent,supercedes:a.TEXT.supercedes});},init:function(e,d){b.superclass.init.call(this,e);this.beforeInitEvent.fire(b);c.addClass(this.element,b.CSS_SIMPLEDIALOG);this.cfg.queueProperty("postmethod","manual");if(d){this.cfg.applyConfig(d,true);}this.beforeRenderEvent.subscribe(function(){if(!this.body){this.setBody("");}},this,true);this.initEvent.fire(b);},registerForm:function(){b.superclass.registerForm.call(this);var e=this.form.ownerDocument,d=e.createElement("input");d.type="hidden";d.name=this.id;d.value="";this.form.appendChild(d);},configIcon:function(k,j,h){var d=j[0],e=this.body,f=b.ICON_CSS_CLASSNAME,l,i,g;if(d&&d!="none"){l=c.getElementsByClassName(f,"*",e);if(l.length===1){i=l[0];g=i.parentNode;if(g){g.removeChild(i);i=null;}}if(d.indexOf(".")==-1){i=document.createElement("span");i.className=(f+" "+d);i.innerHTML="&#160;";}else{i=document.createElement("img");i.src=(this.imageRoot+d);i.className=f;}if(i){e.insertBefore(i,e.firstChild);}}},configText:function(e,d,f){var g=d[0];if(g){this.setBody(g);this.cfg.refireEvent("icon");}},toString:function(){return"SimpleDialog "+this.id;}});}());(function(){YAHOO.widget.ContainerEffect=function(e,h,g,d,f){if(!f){f=YAHOO.util.Anim;}this.overlay=e;this.attrIn=h;this.attrOut=g;this.targetElement=d||e.element;this.animClass=f;};var b=YAHOO.util.Dom,c=YAHOO.util.CustomEvent,a=YAHOO.widget.ContainerEffect;a.FADE=function(d,f){var g=YAHOO.util.Easing,i={attributes:{opacity:{from:0,to:1}},duration:f,method:g.easeIn},e={attributes:{opacity:{to:0}},duration:f,method:g.easeOut},h=new a(d,i,e,d.element);h.handleUnderlayStart=function(){var k=this.overlay.underlay;if(k&&YAHOO.env.ua.ie){var j=(k.filters&&k.filters.length>0);if(j){b.addClass(d.element,"yui-effect-fade");}}};h.handleUnderlayComplete=function(){var j=this.overlay.underlay;if(j&&YAHOO.env.ua.ie){b.removeClass(d.element,"yui-effect-fade");}};h.handleStartAnimateIn=function(k,j,l){l.overlay._fadingIn=true;b.addClass(l.overlay.element,"hide-select");if(!l.overlay.underlay){l.overlay.cfg.refireEvent("underlay");
-}l.handleUnderlayStart();l.overlay._setDomVisibility(true);b.setStyle(l.overlay.element,"opacity",0);};h.handleCompleteAnimateIn=function(k,j,l){l.overlay._fadingIn=false;b.removeClass(l.overlay.element,"hide-select");if(l.overlay.element.style.filter){l.overlay.element.style.filter=null;}l.handleUnderlayComplete();l.overlay.cfg.refireEvent("iframe");l.animateInCompleteEvent.fire();};h.handleStartAnimateOut=function(k,j,l){l.overlay._fadingOut=true;b.addClass(l.overlay.element,"hide-select");l.handleUnderlayStart();};h.handleCompleteAnimateOut=function(k,j,l){l.overlay._fadingOut=false;b.removeClass(l.overlay.element,"hide-select");if(l.overlay.element.style.filter){l.overlay.element.style.filter=null;}l.overlay._setDomVisibility(false);b.setStyle(l.overlay.element,"opacity",1);l.handleUnderlayComplete();l.overlay.cfg.refireEvent("iframe");l.animateOutCompleteEvent.fire();};h.init();return h;};a.SLIDE=function(f,d){var i=YAHOO.util.Easing,l=f.cfg.getProperty("x")||b.getX(f.element),k=f.cfg.getProperty("y")||b.getY(f.element),m=b.getClientWidth(),h=f.element.offsetWidth,j={attributes:{points:{to:[l,k]}},duration:d,method:i.easeIn},e={attributes:{points:{to:[(m+25),k]}},duration:d,method:i.easeOut},g=new a(f,j,e,f.element,YAHOO.util.Motion);g.handleStartAnimateIn=function(o,n,p){p.overlay.element.style.left=((-25)-h)+"px";p.overlay.element.style.top=k+"px";};g.handleTweenAnimateIn=function(q,p,r){var s=b.getXY(r.overlay.element),o=s[0],n=s[1];if(b.getStyle(r.overlay.element,"visibility")=="hidden"&&o<l){r.overlay._setDomVisibility(true);}r.overlay.cfg.setProperty("xy",[o,n],true);r.overlay.cfg.refireEvent("iframe");};g.handleCompleteAnimateIn=function(o,n,p){p.overlay.cfg.setProperty("xy",[l,k],true);p.startX=l;p.startY=k;p.overlay.cfg.refireEvent("iframe");p.animateInCompleteEvent.fire();};g.handleStartAnimateOut=function(o,n,r){var p=b.getViewportWidth(),s=b.getXY(r.overlay.element),q=s[1];r.animOut.attributes.points.to=[(p+25),q];};g.handleTweenAnimateOut=function(p,o,q){var s=b.getXY(q.overlay.element),n=s[0],r=s[1];q.overlay.cfg.setProperty("xy",[n,r],true);q.overlay.cfg.refireEvent("iframe");};g.handleCompleteAnimateOut=function(o,n,p){p.overlay._setDomVisibility(false);p.overlay.cfg.setProperty("xy",[l,k]);p.animateOutCompleteEvent.fire();};g.init();return g;};a.prototype={init:function(){this.beforeAnimateInEvent=this.createEvent("beforeAnimateIn");this.beforeAnimateInEvent.signature=c.LIST;this.beforeAnimateOutEvent=this.createEvent("beforeAnimateOut");this.beforeAnimateOutEvent.signature=c.LIST;this.animateInCompleteEvent=this.createEvent("animateInComplete");this.animateInCompleteEvent.signature=c.LIST;this.animateOutCompleteEvent=this.createEvent("animateOutComplete");this.animateOutCompleteEvent.signature=c.LIST;this.animIn=new this.animClass(this.targetElement,this.attrIn.attributes,this.attrIn.duration,this.attrIn.method);this.animIn.onStart.subscribe(this.handleStartAnimateIn,this);this.animIn.onTween.subscribe(this.handleTweenAnimateIn,this);this.animIn.onComplete.subscribe(this.handleCompleteAnimateIn,this);this.animOut=new this.animClass(this.targetElement,this.attrOut.attributes,this.attrOut.duration,this.attrOut.method);this.animOut.onStart.subscribe(this.handleStartAnimateOut,this);this.animOut.onTween.subscribe(this.handleTweenAnimateOut,this);this.animOut.onComplete.subscribe(this.handleCompleteAnimateOut,this);},animateIn:function(){this._stopAnims(this.lastFrameOnStop);this.beforeAnimateInEvent.fire();this.animIn.animate();},animateOut:function(){this._stopAnims(this.lastFrameOnStop);this.beforeAnimateOutEvent.fire();this.animOut.animate();},lastFrameOnStop:true,_stopAnims:function(d){if(this.animOut&&this.animOut.isAnimated()){this.animOut.stop(d);}if(this.animIn&&this.animIn.isAnimated()){this.animIn.stop(d);}},handleStartAnimateIn:function(e,d,f){},handleTweenAnimateIn:function(e,d,f){},handleCompleteAnimateIn:function(e,d,f){},handleStartAnimateOut:function(e,d,f){},handleTweenAnimateOut:function(e,d,f){},handleCompleteAnimateOut:function(e,d,f){},toString:function(){var d="ContainerEffect";if(this.overlay){d+=" ["+this.overlay.toString()+"]";}return d;}};YAHOO.lang.augmentProto(a,YAHOO.util.EventProvider);})();YAHOO.register("container",YAHOO.widget.Module,{version:"2.9.0",build:"2800"});
\ No newline at end of file
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container.css b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container.css
deleted file mode 100755
index 34adc56c..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/container.css
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-Copyright (c) 2011, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.9.0
-*/
-.yui-overlay,
-.yui-panel-container {
-    visibility:hidden;
-    position:absolute;
-    z-index: 2;
-}
-
-.yui-tt {
-    visibility:hidden;
-    position:absolute;
-    color:#333;
-    background-color:#FDFFB4;
-    font-family:arial,helvetica,verdana,sans-serif;
-    padding:2px;
-    border:1px solid #FCC90D;
-    font:100% sans-serif;
-    width:auto;
-}
-
-/*
-    PLEASE NOTE: The <DIV> element used for a Tooltip's shadow is appended
-    to its root element via JavaScript once it has been rendered.  The
-    code that creates the shadow lives in the Tooltip's public "onRender"
-    event handler that is a prototype method of YAHOO.widget.Tooltip.
-    Implementers wishing to remove a Tooltip's shadow or add any other markup
-    required for a given skin for Tooltip should override the "onRender" method.
-*/
-
-.yui-tt-shadow {
-    display: none;
-}
-
-* html body.masked select {
-    visibility:hidden;
-}
-
-* html div.yui-panel-container select {
-    visibility:inherit;
-}
-
-* html div.drag select {
-    visibility:hidden;
-}
-
-* html div.hide-select select {
-    visibility:hidden;
-}
-
-.mask {
-    z-index: 1;
-    display:none;
-    position:absolute;
-    top:0;
-    left:0;
-    -moz-opacity: 0.5;
-    opacity:.50;
-    filter: alpha(opacity=50);
-    background-color:#CCC;
-}
-
-/*
-
-There are two known issues with YAHOO.widget.Overlay (and its subclasses) that
-manifest in Gecko-based browsers on Mac OS X:
-
-    1) Elements with scrollbars will poke through Overlay instances floating
-       above them.
-
-    2) An Overlay's scrollbars and the scrollbars of its child nodes remain
-       visible when the Overlay is hidden.
-
-To fix these bugs:
-
-    1) The "overflow" property of an Overlay instance's root element and child
-       nodes is toggled between "hidden" and "auto" (through the application
-       and removal of the "hide-scrollbars" and "show-scrollbars" CSS classes)
-       as its "visibility" configuration property is toggled between
-       "false" and "true."
-
-    2) The "display" property of <SELECT> elements that are child nodes of the
-       Overlay instance's root element is set to "none" when it is hidden.
-
-PLEASE NOTE:
-
-    1) The "hide-scrollbars" and "show-scrollbars" CSS classes classes are
-       applied only for Gecko on Mac OS X and are added/removed to/from the
-       Overlay's root HTML element (DIV) via the "hideMacGeckoScrollbars" and
-       "showMacGeckoScrollbars" methods of YAHOO.widget.Overlay.
-
-    2) There may be instances where the CSS for a web page or application
-       contains style rules whose specificity override the rules implemented by
-       the Container CSS files to fix this bug.  In such cases, is necessary to
-       leverage the provided "hide-scrollbars" and "show-scrollbars" classes to
-       write custom style rules to guard against this bug.
-
-** For more information on this issue, see:
-   + https://bugzilla.mozilla.org/show_bug.cgi?id=187435
-   + YUILibrary bug #1723530
-
-*/
-
-.hide-scrollbars,
-.hide-scrollbars * {
-
-    overflow: hidden;
-
-}
-
-.hide-scrollbars select {
-
-    display: none;
-
-}
-
-.show-scrollbars {
-
-    overflow: auto;
-
-}
-
-.yui-panel-container.show-scrollbars {
-
-    overflow: visible;
-
-}
-
-.yui-panel-container.show-scrollbars .underlay {
-
-    overflow: auto;
-
-}
-
-.yui-panel-container.focused {
-
-}
-
-
-/* Panel underlay styles */
-
-.yui-panel-container .underlay {
-
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-
-}
-
-.yui-panel-container.matte {
-
-    padding: 3px;
-    background-color: #fff;
-
-}
-
-.yui-panel-container.shadow .underlay {
-
-    top: 3px;
-    bottom: -3px;
-    right: -3px;
-    left: 3px;
-    background-color: #000;
-    opacity: .12;
-    filter: alpha(opacity=12);  /* For IE */
-
-}
-
-/*
-   Workaround for Safari 2.x - the yui-force-redraw class is applied, and then removed when
-   the Panel's content changes, to force Safari 2.x to redraw the underlay.
-   We attempt to choose a CSS property which has no visual impact when added,
-   removed, but still causes Safari to redraw
-*/
-.yui-panel-container.shadow .underlay.yui-force-redraw {
-    padding-bottom: 1px;
-}
-
-.yui-effect-fade .underlay {
-    display:none;
-}
-
-.yui-panel {
-    visibility:hidden;
-    border-collapse:separate;
-    position:relative;
-    left:0;
-    top:0;
-    font:1em Arial;
-    background-color:#FFF;
-    border:1px solid #000;
-    z-index:1;
-    overflow:hidden;
-}
-
-.yui-panel .hd {
-    background-color:#3d77cb;
-    color:#FFF;
-    font-size:100%;
-    line-height:100%;
-    border:1px solid #FFF;
-    border-bottom:1px solid #000;
-    font-weight:bold;
-    padding:4px;
-    white-space:nowrap;
-}
-
-.yui-panel .bd {
-    overflow:hidden;
-    padding:4px;
-}
-
-.yui-panel .bd p {
-    margin:0 0 1em;
-}
-
-.yui-panel .container-close {
-    position:absolute;
-    top:5px;
-    right:4px;
-    z-index:6;
-    height:12px;
-    width:12px;
-    margin:0px;
-    padding:0px;
-    background:url(close12_1.gif) no-repeat;
-    cursor:pointer;
-    visibility:inherit;
-    text-indent:-10000em;
-    overflow:hidden;
-    text-decoration:none;
-}
-
-.yui-panel .ft {
-    padding:4px;
-    overflow:hidden;
-}
-
-.yui-simple-dialog .bd .yui-icon {
-    background-repeat:no-repeat;
-    width:16px;
-    height:16px;
-    margin-right:10px;
-    float:left;
-}
-
-.yui-simple-dialog .bd span.blckicon {
-    background: url("blck16_1.gif") no-repeat;
-}
-
-.yui-simple-dialog .bd span.alrticon {
-    background: url("alrt16_1.gif") no-repeat;
-}
-
-.yui-simple-dialog .bd span.hlpicon {
-    background: url("hlp16_1.gif") no-repeat;
-}
-
-.yui-simple-dialog .bd span.infoicon {
-    background: url("info16_1.gif") no-repeat;
-}
-
-.yui-simple-dialog .bd span.warnicon {
-    background: url("warn16_1.gif") no-repeat;
-}
-
-.yui-simple-dialog .bd span.tipicon {
-    background: url("tip16_1.gif") no-repeat;
-}
-
-.yui-dialog .ft,
-.yui-simple-dialog .ft {
-    padding-bottom:5px;
-    padding-right:5px;
-    text-align:right;
-}
-
-.yui-dialog form,
-.yui-simple-dialog form {
-    margin:0;
-}
-
-.button-group button {
-    font:100 76% verdana;
-    text-decoration:none;
-    background-color: #E4E4E4;
-    color: #333;
-    cursor: hand;
-    vertical-align: middle;
-    border: 2px solid #797979;
-    border-top-color:#FFF;
-    border-left-color:#FFF;
-    margin:2px;
-    padding:2px;
-}
-
-.button-group button.default {
-    font-weight:bold;
-}
-
-.button-group button:hover,
-.button-group button.hover {
-    border:2px solid #90A029;
-    background-color:#EBF09E;
-    border-top-color:#FFF;
-    border-left-color:#FFF;
-}
-
-.button-group button:active {
-    border:2px solid #E4E4E4;
-    background-color:#BBB;
-    border-top-color:#333;
-    border-left-color:#333;
-}
-
-.yui-override-padding {
-    padding:0 !important;
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
deleted file mode 100755
index a63a9b0a..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist
+++ /dev/null
@@ -1,115 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={charset}">
-    <title>{title}</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
-    <script src="jquery.min.js" type="text/javascript"></script>
-    <script src="highcharts.js" type="text/javascript"></script>
-    <script type="text/javascript">
-    $(document).ready(function() {
-          var classCoverageDistribution = new Highcharts.Chart({
-             chart: {
-                renderTo: 'classCoverageDistribution',
-                type: 'column'
-             },
-             title: {text: ''},
-             legend: {enabled: false},
-             credits: {enabled: false},
-             tooltip: {enabled: false},
-             xAxis: {
-                 labels: {style: {fontSize: '8px'}},
-                 categories: [
-                 '0%','0-10%','10-20%','20-30%','30-40%','40-50%','50-60%','60-70%','70-80%','80-90%','90-100%','100%'
-                 ]
-            },
-            yAxis: {
-                title: '',
-                labels: {style: {fontSize: '8px'}},
-            },
-            series: [{
-                data: {ccd_values}
-            }],
-          });
-
-        var classComplexity = new Highcharts.Chart({
-            chart: {
-              renderTo: 'classComplexity',
-              type: 'scatter'
-            },
-            title: {text: ''},
-            legend: {enabled: false},
-            credits: {enabled: false},
-            xAxis: {
-               labels: {enabled: false},
-            },
-            yAxis: {
-              title: '',
-              labels: {enabled: false},
-            },
-            tooltip: {
-                formatter: function() {
-                    return this.point.config[2];
-                }
-            },
-            series: [{
-              data: {cc_values},
-              marker: {
-                  symbol: 'diamond'
-              }
-            }],
-        });
-    });
-    </script>
-  </head>
-
-  <body>
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="title">{title}</td></tr>
-      <tr><td><div align="center"><p><a href="{backlink}">Back to Code Coverage report</a></p></div></td></tr>
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-    </table>
-
-    <br />
-
-    <center>
-      <table width="90%" cellpadding="2" cellspacing="1" border="0">
-        <tr>
-          <td valign="top">
-            <h2>Class Coverage Distribution</h2>
-            <div id="classCoverageDistribution"></div>
-          </td>
-
-          <td valign="top">
-            <h2>Class Complexity</h2>
-            <div id="classComplexity"></div>
-          </td>
-        </tr>
-        <tr>
-          <td valign="top">
-            <h2>Top Project Risks</h2>
-            <ul>
-{top_project_risks}
-            </ul>
-          </td>
-
-          <td valign="top">
-            <h2>Least Tested Methods</h2>
-            <ul>
-{least_tested_methods}
-            </ul>
-          </td>
-        </tr>
-      </table>
-    </center>
-
-    <br />
-
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-      <tr><td class="versionInfo">Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</td></tr>
-    </table>
-
-    <br/>
-  </body>
-</html>
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
deleted file mode 100755
index e1131c34..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist
+++ /dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={charset}">
-    <title>{title}</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
-  </head>
-
-  <body>
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="title">{title}</td></tr>
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-
-      <tr>
-        <td width="100%">
-          <table cellpadding="1" border="0" width="100%">
-            <tr>
-              <td class="headerItem" width="20%">Current directory:</td>
-              <td class="headerValue" width="80%">{link} (<a href="{id}.dashboard.html">dashboard</a>)</td>
-            </tr>
-            <tr>
-              <td class="legendItem" width="20%">Legend:</td>
-              <td class="legendValue" width="80%">
-                <span class="coverLegendLo">
-                  <b>Low:</b> 0% to {low_upper_bound}%
-                </span>
-                <span class="coverLegendMed">
-                  <b>Medium:</b> {low_upper_bound}% to {high_lower_bound}%
-                </span>
-                <span class="coverLegendHi">
-                  <b>High:</b> {high_lower_bound}% to 100%
-                </span>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-      <tr>
-        <td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td>
-      </tr>
-    </table>
-
-    <br />
-
-    <center>
-      <table width="90%" cellpadding="2" cellspacing="1" border="0">
-        <tr>
-          <td class="tableHead" width="30%">&nbsp;</td>
-          <td class="tableHead" colspan="9">Coverage</td>
-        </tr>
-        <tr>
-          <td class="tableHead">&nbsp;</td>
-          <td class="tableHead" colspan="3">Lines</td>
-          <td class="tableHead" colspan="3">Functions / Methods</td>
-          <td class="tableHead" colspan="3">Classes</td>
-        </tr>
-{items}
-      </table>
-    </center>
-
-    <br />
-
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-      <tr><td class="versionInfo">Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</td></tr>
-    </table>
-
-    <br/>
-  </body>
-</html>
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.png b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.png
deleted file mode 100755
index 65bd0bbdcb9005cb8929f06e25d9cb15a926366a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10m4Z{K~y-6rI0aelTj3gpL6e5EGgpP5V{l`oHBOnE}0yH(A8g{
zyU;)2;#ODxhbY9kV8mG|iX@UyX}=~V-@WIa<B%pcSX#k%Iox~CdG2{%>2|yPkE-3>
z-8b(3_?ov1cYiV%432IDm|3sa>)kUm%nWx2;PmwLe!t&8>~uQMm(4k6LI`Cz9Dc0p
zx&Tx;XIE7wlL@7i6(oef_V#uMc)NrGOsCVTl=7;s>w_zRjH+U0Ymj!k-P+vTq}6H>
zV<d#YXf$Fx9zR@JP*qbc9DYd5nm<2*0N~7l`Rdj^0DJrF?Cr-GzEwGAPbo2NoR`lY
zA#&MxH7Q>^0g%)=c>R8-N-3GD0!|F@>G<sG0?V?Vd=wtEw?N!0RVC+)h!BGi<8>qJ
z%4)bdf_Rm4wwyD#6GYg!0ieZcvQf+lK>!v2)x`$$R0x3iqPe(Z=9oKK7j<c&NwxyG
zYC)u8Qa22L&1uwbv`|H1ayDN8RMk>S;E^w*b55oWe`mg~7=)i^mlj0C%nT8s$wuo=
zb!&(s!bMVmQn@?FCx!@o{yMsKc&XWJj=)i68(aN%$9JEC^W*#Yp8+C_MZ$~UM;0NT
T9Al?300000NkvXXu0mjfM@0T3

diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
deleted file mode 100755
index 17e89f30..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-        <tr>
-          <td class="{itemClass}">{icon}{name}</td>
-          <td class="coverBar">
-            <div class="coverBarOutline" title="{lines_executed_percent}">
-              <div class="size {lines_color}"  style="width:{lines_executed_width}%" title="{lines_executed_percent}"></div>
-            </div>
-          </td>
-          <td class="coverPer{lines_level}">{lines_executed_percent}</td>
-          <td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
-          <td class="coverBar">
-            <div class="coverBarOutline" title="{methods_tested_percent}">
-                <div class="size {methods_color}"  style="width:{methods_tested_width}%" title="{methods_tested_percent}"></div>
-            </div>
-          </td>
-          <td class="coverPer{methods_level}">{methods_tested_percent}</td>
-          <td class="coverNum{methods_level}">{methods_number}</td>
-          <td class="coverBar">
-              <div class="coverBarOutline" title="{classes_tested_percent}">
-                 <div class="size {classes_color}"  style="width:{classes_tested_width}%" title="{classes_tested_percent}"></div>
-              </div>
-          </td>
-          <td class="coverPer{classes_level}">{classes_tested_percent}</td>
-          <td class="coverNum{classes_level}">{classes_number}</td>
-        </tr>
-
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
deleted file mode 100755
index 97b61a58..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={charset}">
-    <title>{title}</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
-    <link rel="stylesheet" type="text/css" href="container.css">
-    <script type="text/javascript" src="yahoo-dom-event.js"></script>
-    <script type="text/javascript" src="container-min.js"></script>
-  </head>
-
-  <body class="yui-skin-sam">
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="title">{title}</td></tr>
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-
-      <tr>
-        <td width="100%">
-          <table cellpadding="1" border="0" width="100%">
-            <tr>
-              <td class="headerItem" width="20%">Current file:</td>
-              <td class="headerValue" width="80%">{link}</td>
-            </tr>
-            <tr>
-              <td class="legendItem" width="20%">Legend:</td>
-              <td class="legendValue" width="80%">
-                <span class="legendCov">executed</span>
-                <span class="legendNoCov">not executed</span>
-                <span class="legendDeadCode">dead code</span>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td>
-      </tr>
-    </table>
-
-    <br />
-
-    <center>
-      <table width="90%" cellpadding="2" cellspacing="1" border="0">
-        <tr>
-          <td class="tableHead" width="30%">&nbsp;</td>
-          <td class="tableHead" colspan="10">Coverage</td>
-        </tr>
-        <tr>
-          <td class="tableHead">&nbsp;</td>
-          <td class="tableHead" colspan="3">Classes</td>
-          <td class="tableHead" colspan="4">Functions / Methods</td>
-          <td class="tableHead" colspan="3">Lines</td>
-        </tr>
-{items}
-      </table>
-    </center>
-
-    <br />
-
-    <table cellpadding="0" cellspacing="0" border="0">
-      <tr>
-        <td><br /></td>
-      </tr>
-      <tr>
-        <td>
-<pre class="source">
-{source}
-</pre>
-        </td>
-      </tr>
-    </table>
-
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-      <tr><td class="versionInfo">Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</td></tr>
-    </table>
-
-    <br />
-
-    <script type="text/javascript">
-      //<![CDATA[
-      $E = YAHOO.util.Event;
-      YAHOO.namespace("phpunit.container");
-      YAHOO.phpunit.container.panelsData = {
-{yuiPanelJS}      "dummy": ""
-      };
-
-      YAHOO.phpunit.container.prepare = function (e) {
-        var elemId = $E.getTarget(e).id;
-        var line = elemId.substr(4);
-        var panelId = "panel" + line;
-        var containerId = "container" + line;
-
-        var panelData = YAHOO.phpunit.container.panelsData[panelId];
-
-        var panel = new YAHOO.widget.Panel(panelId, { visible:false, draggable:false, close:true } );
-        panel.setHeader(panelData["header"]);
-        panel.setBody(panelData["body"]);
-        panel.setFooter(panelData["footer"]);
-        panel.render(containerId);
-
-        $E.addListener(elemId, "click", panel.show, panel, true);
-        $E.removeListener(elemId, "mouseover");
-      };
-
-      function init() {
-        var ypc = YAHOO.phpunit.container;
-        for (var panelId in ypc.panelsData) {
-          var elemId = "line" + panelId.substr(5);
-          $E.addListener(elemId, "mouseover", ypc.prepare);
-        }
-      }
-
-      $E.addListener(window, "load", init);
-      //]]>
-    </script>
-  </body>
-</html>
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.png b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.png
deleted file mode 100755
index 2d7f2d6017d823bf9f1209d9933faf612dffe9f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP$i<k(%#jXT3C!o+RPZ!4!i_>c-+2*wv2(<2J_t+h+
zs5rlI{^p#SO2-|aiODDi-jZP}W|aE1)~BmOR3$EA(Vi@w>U%ZDa$9qM8}c0HKK>=@
z`d4d)YqwsmShMx=n<-}wTJ%-CXPi)?Z+d)E$Kx3$zTq0>%<pZ_?F>B>G-<`ESK<06
zKLv;!Rde(>`RU=L2g~Ovo%n1M@bQ?*+>S*Vvl$k=|9v$za@qmb9gNTaiaD`NnxMxo
zp5*#q&TW}{<`>WDw{ULpSLj^#x@qe3m+d`GEQ*uw+Md|dvtPsTSdE!)vF)Ukp32Aj
azp#b`#_#;I)BX+6mkge+elF{r5}E*#afeO-

diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
deleted file mode 100755
index 56c12e9d..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-        <tr>
-          <td class="{itemClass}">{name}</td>
-          <td class="coverBar">
-             <div class="coverBarOutline" title="{classes_tested_percent}">
-                <div class="size {classes_color}"  style="width:{classes_tested_width}%" title="{classes_tested_percent}"></div>
-             </div>
-          </td>
-          <td class="coverPer{classes_level}">{classes_tested_percent}</td>
-          <td class="coverNum{classes_level}">{classes_number}</td>
-          <td class="coverBar">
-            <div class="coverBarOutline" title="{methods_tested_percent}">
-                <div class="size {methods_color}"  style="width:{methods_tested_width}%" title="{methods_tested_percent}"></div>
-            </div>
-          </td>
-          <td class="coverPer{methods_level}">{methods_tested_percent}</td>
-          <td class="coverNum{methods_level}">{methods_number}</td>
-          <td class="crap">{crap}</td>
-          <td class="coverBar">
-            <div class="coverBarOutline" title="{lines_executed_percent}">
-                <div class="size {lines_color}"  style="width:{lines_executed_width}%" title="{lines_executed_percent}"></div>
-            </div>
-          </td>
-          <td class="coverPer{lines_level}">{lines_executed_percent}</td>
-          <td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
-        </tr>
-
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist
deleted file mode 100755
index 3003ec19..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_no_yui.html.dist
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
-<html lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={charset}">
-    <title>{title}</title>
-    <link rel="stylesheet" type="text/css" href="style.css">
-  </head>
-
-  <body>
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="title">{title}</td></tr>
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-
-      <tr>
-        <td width="100%">
-          <table cellpadding="1" border="0" width="100%">
-            <tr>
-              <td class="headerItem" width="20%">Current file:</td>
-              <td class="headerValue" width="80%">{link}</td>
-            </tr>
-            <tr>
-              <td class="legendItem" width="20%">Legend:</td>
-              <td class="legendValue" width="80%">
-                <span class="legendCov">executed</span>
-                <span class="legendNoCov">not executed</span>
-                <span class="legendDeadCode">dead code</span>
-              </td>
-            </tr>
-          </table>
-        </td>
-      </tr>
-
-      <tr>
-        <td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td>
-      </tr>
-    </table>
-
-    <br />
-
-    <center>
-      <table width="90%" cellpadding="2" cellspacing="1" border="0">
-        <tr>
-          <td class="tableHead" width="30%">&nbsp;</td>
-          <td class="tableHead" colspan="9">Coverage</td>
-        </tr>
-        <tr>
-          <td class="tableHead">&nbsp;</td>
-          <td class="tableHead" colspan="3">Classes</td>
-          <td class="tableHead" colspan="3">Functions / Methods</td>
-          <td class="tableHead" colspan="3">Lines</td>
-        </tr>
-{items}
-      </table>
-    </center>
-
-    <br />
-
-    <table cellpadding="0" cellspacing="0" border="0">
-      <tr>
-        <td><br /></td>
-      </tr>
-      <tr>
-        <td>
-<pre class="source">
-{source}
-</pre>
-        </td>
-      </tr>
-    </table>
-
-    <table width="100%" border="0" cellspacing="0" cellpadding="0">
-      <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr>
-      <tr><td class="versionInfo">Generated by <a href="http://github.com/sebastianbergmann/php-code-coverage" target="_top">PHP_CodeCoverage {version}</a> using <a href="http://www.php.net/" target="_top">PHP {php_version}</a>{generator} at {date}.</td></tr>
-    </table>
-
-    <br />
-  </body>
-</html>
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/glass.png b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/glass.png
deleted file mode 100755
index e1abc00680a3093c49fdb775ae6bdb6764c95af2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 167
zcmeAS@N?(olHy`uVBq!ia0vp^j3CU&3?x-=hn)gaEa{HEjtmSN`?>!lvI6;R0X`wF
z|Ns97GD8ntt^-nxB|(0{3=Yq3q=7g|-tI089jvk*Kn`btM`SSr1Gf+eGhVt|_XjA*
zUgGKN%6^Gmn4d%Ph(nkFP>9RZ#WAE}PI3Z}&BVayv3^M*kj3EX>gTe~DWM4f=_Dpv

diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js
deleted file mode 100755
index 0a9d24f9..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/highcharts.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
- Highcharts JS v2.1.6 (2011-07-08)
-
- (c) 2009-2011 Torstein H?nsi
-
- License: www.highcharts.com/license
-*/
-(function(){function pa(a,b){var c;a||(a={});for(c in b)a[c]=b[c];return a}function ja(a,b){return parseInt(a,b||10)}function Pb(a){return typeof a==="string"}function Lb(a){return typeof a==="object"}function dc(a){return typeof a==="number"}function qc(a,b){for(var c=a.length;c--;)if(a[c]===b){a.splice(c,1);break}}function M(a){return a!==Va&&a!==null}function Ea(a,b,c){var d,e;if(Pb(b))if(M(c))a.setAttribute(b,c);else{if(a&&a.getAttribute)e=a.getAttribute(b)}else if(M(b)&&Lb(b))for(d in b)a.setAttribute(d,
-b[d]);return e}function rc(a){if(!a||a.constructor!==Array)a=[a];return a}function C(){var a=arguments,b,c,d=a.length;for(b=0;b<d;b++){c=a[b];if(typeof c!=="undefined"&&c!==null)return c}}function Na(a,b){if(Bc)if(b&&b.opacity!==Va)b.filter="alpha(opacity="+b.opacity*100+")";pa(a.style,b)}function ib(a,b,c,d,e){a=wa.createElement(a);b&&pa(a,b);e&&Na(a,{padding:0,border:jb,margin:0});c&&Na(a,c);d&&d.appendChild(a);return a}function yb(a,b){var c=function(){};c.prototype=new a;pa(c.prototype,b);return c}
-function zd(a,b,c,d){var e=Wa.lang;a=a;var f=isNaN(b=$a(b))?2:b;b=c===undefined?e.decimalPoint:c;d=d===undefined?e.thousandsSep:d;e=a<0?"-":"";c=String(ja(a=$a(+a||0).toFixed(f)));var g=c.length>3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+$a(a-c).toFixed(f).slice(2):"")}function Ad(){this.symbol=this.color=0}function ec(a,b){Cc=C(a,b.animation)}function Bd(){var a=Wa.global.useUTC;Dc=a?Date.UTC:function(b,c,d,e,f,g){return(new Date(b,c,C(d,1),C(e,
-0),C(f,0),C(g,0))).getTime()};bd=a?"getUTCMinutes":"getMinutes";cd=a?"getUTCHours":"getHours";dd=a?"getUTCDay":"getDay";sc=a?"getUTCDate":"getDate";Ec=a?"getUTCMonth":"getMonth";Fc=a?"getUTCFullYear":"getFullYear";Cd=a?"setUTCMinutes":"setMinutes";Dd=a?"setUTCHours":"setHours";ed=a?"setUTCDate":"setDate";Ed=a?"setUTCMonth":"setMonth";Fd=a?"setUTCFullYear":"setFullYear"}function Gc(a){Hc||(Hc=ib(Qb));a&&Hc.appendChild(a);Hc.innerHTML=""}function Ic(){}function Gd(a,b){function c(m,i){function y(k,
-o){this.pos=k;this.minor=o;this.isNew=true;o||this.addLabel()}function x(k){if(k){this.options=k;this.id=k.id}return this}function Q(k,o,r){this.isNegative=o;this.options=k;this.x=r;this.alignOptions={align:k.align||(qa?o?"left":"right":"center"),verticalAlign:k.verticalAlign||(qa?"middle":o?"bottom":"top"),y:C(k.y,qa?4:o?14:-6),x:C(k.x,qa?o?-6:6:0)};this.textAlign=k.textAlign||(qa?o?"right":"left":"center")}function na(){var k=[],o=[],r;T=ra=null;Fa=[];u(Ia,function(q){r=false;u(["xAxis","yAxis"],
-function(ma){if(q.isCartesian&&(ma==="xAxis"&&Ga||ma==="yAxis"&&!Ga)&&(q.options[ma]===i.index||q.options[ma]===Va&&i.index===0)){q[ma]=v;Fa.push(q);r=true}});if(!q.visible&&w.ignoreHiddenSeries)r=false;if(r){var A,U,G,V,Ba;if(!Ga){A=q.options.stacking;Jc=A==="percent";if(A){V=q.type+C(q.options.stack,"");Ba="-"+V;q.stackKey=V;U=k[V]||[];k[V]=U;G=o[Ba]||[];o[Ba]=G}if(Jc){T=0;ra=99}}if(q.isCartesian){u(q.data,function(ma){var s=ma.x,W=ma.y,ba=W<0,ia=ba?G:U,zb=ba?Ba:V;if(T===null)T=ra=ma[$];if(Ga)if(s>
-ra)ra=s;else{if(s<T)T=s}else if(M(W)){if(A)ia[s]=M(ia[s])?ia[s]+W:W;W=ia?ia[s]:W;ma=C(ma.low,W);if(!Jc)if(W>ra)ra=W;else if(ma<T)T=ma;if(A){t[zb]||(t[zb]={});t[zb][s]||(t[zb][s]=new Q(i.stackLabels,ba,s));t[zb][s].setTotal(W)}}});if(/(area|column|bar)/.test(q.type)&&!Ga)if(T>=0){T=0;Hd=true}else if(ra<0){ra=0;Id=true}}}})}function O(k,o){var r,q;Fb=o?1:sa.pow(10,kb(sa.log(k)/sa.LN10));r=k/Fb;if(!o){o=[1,2,2.5,5,10];if(i.allowDecimals===false||H)if(Fb===1)o=[1,2,5,10];else if(Fb<=0.1)o=[1/Fb]}for(q=
-0;q<o.length;q++){k=o[q];if(r<=(o[q]+(o[q+1]||o[q]))/2)break}k*=Fb;return k}function ea(k){var o;o=k;Fb=C(Fb,sa.pow(10,kb(sa.log(Ta)/sa.LN10)));if(Fb<1){o=X(1/Fb)*10;o=X(k*o)/o}return o}function Ma(){var k,o,r,q,A=i.tickInterval,U=i.tickPixelInterval;k=i.maxZoom||(Ga&&!M(i.min)&&!M(i.max)?qb(m.smallestInterval*5,ra-T):null);oa=z?Ca:xa;if(Rb){r=m[Ga?"xAxis":"yAxis"][i.linkedTo];q=r.getExtremes();ca=C(q.min,q.dataMin);fa=C(q.max,q.dataMax)}else{ca=C(Ja,i.min,T);fa=C(Oa,i.max,ra)}if(H){ca=sa.log(ca)/
-sa.LN10;fa=sa.log(fa)/sa.LN10}if(fa-ca<k){q=(k-fa+ca)/2;ca=Ha(ca-q,C(i.min,ca-q),T);fa=qb(ca+k,C(i.max,ca+k),ra)}if(!Xa&&!Jc&&!Rb&&M(ca)&&M(fa)){k=fa-ca||1;if(!M(i.min)&&!M(Ja)&&Jd&&(T<0||!Hd))ca-=k*Jd;if(!M(i.max)&&!M(Oa)&&Kd&&(ra>0||!Id))fa+=k*Kd}Ta=ca===fa?1:Rb&&!A&&U===r.options.tickPixelInterval?r.tickInterval:C(A,Xa?1:(fa-ca)*U/oa);if(!F&&!M(i.tickInterval))Ta=O(Ta);v.tickInterval=Ta;Kc=i.minorTickInterval==="auto"&&Ta?Ta/5:i.minorTickInterval;if(F){ta=[];A=Wa.global.useUTC;var G=1E3/rb,V=6E4/
-rb,Ba=36E5/rb;U=864E5/rb;k=6048E5/rb;q=2592E6/rb;var ma=31556952E3/rb,s=[["second",G,[1,2,5,10,15,30]],["minute",V,[1,2,5,10,15,30]],["hour",Ba,[1,2,3,4,6,8,12]],["day",U,[1,2]],["week",k,[1,2]],["month",q,[1,2,3,4,6]],["year",ma,null]],W=s[6],ba=W[1],ia=W[2];for(r=0;r<s.length;r++){W=s[r];ba=W[1];ia=W[2];if(s[r+1])if(Ta<=(ba*ia[ia.length-1]+s[r+1][1])/2)break}if(ba===ma&&Ta<5*ba)ia=[1,2,5];s=O(Ta/ba,ia);ia=new Date(ca*rb);ia.setMilliseconds(0);if(ba>=G)ia.setSeconds(ba>=V?0:s*kb(ia.getSeconds()/
-s));if(ba>=V)ia[Cd](ba>=Ba?0:s*kb(ia[bd]()/s));if(ba>=Ba)ia[Dd](ba>=U?0:s*kb(ia[cd]()/s));if(ba>=U)ia[ed](ba>=q?1:s*kb(ia[sc]()/s));if(ba>=q){ia[Ed](ba>=ma?0:s*kb(ia[Ec]()/s));o=ia[Fc]()}if(ba>=ma){o-=o%s;ia[Fd](o)}ba===k&&ia[ed](ia[sc]()-ia[dd]()+i.startOfWeek);r=1;o=ia[Fc]();G=ia.getTime()/rb;V=ia[Ec]();for(Ba=ia[sc]();G<fa&&r<Ca;){ta.push(G);if(ba===ma)G=Dc(o+r*s,0)/rb;else if(ba===q)G=Dc(o,V+r*s)/rb;else if(!A&&(ba===U||ba===k))G=Dc(o,V,Ba+r*s*(ba===U?1:7));else G+=ba*s;r++}ta.push(G);Lc=i.dateTimeLabelFormats[W[0]]}else{r=
-ea(kb(ca/Ta)*Ta);o=ea(fd(fa/Ta)*Ta);ta=[];for(r=ea(r);r<=o;){ta.push(r);r=ea(r+Ta)}}if(!Rb){if(Xa||Ga&&m.hasColumn){o=(Xa?1:Ta)*0.5;if(Xa||!M(C(i.min,Ja)))ca-=o;if(Xa||!M(C(i.max,Oa)))fa+=o}o=ta[0];r=ta[ta.length-1];if(i.startOnTick)ca=o;else ca>o&&ta.shift();if(i.endOnTick)fa=r;else fa<r&&ta.pop();Mb||(Mb={x:0,y:0});if(!F&&ta.length>Mb[$])Mb[$]=ta.length}}function Aa(){var k,o;Gb=ca;Ld=fa;na();Ma();fb=ua;ua=oa/(fa-ca||1);if(!Ga)for(k in t)for(o in t[k])t[k][o].cum=t[k][o].total;if(!v.isDirty)v.isDirty=
-ca!==Gb||fa!==Ld}function Qa(k){k=(new x(k)).render();Sb.push(k);return k}function Ra(){var k=i.title,o=i.stackLabels,r=i.alternateGridColor,q=i.lineWidth,A,U,G=m.hasRendered,V=G&&M(Gb)&&!isNaN(Gb);A=Fa.length&&M(ca)&&M(fa);oa=z?Ca:xa;ua=oa/(fa-ca||1);eb=z?Y:sb;if(A||Rb){if(Kc&&!Xa)for(A=ca+(ta[0]-ca)%Kc;A<=fa;A+=Kc){Zb[A]||(Zb[A]=new y(A,true));V&&Zb[A].isNew&&Zb[A].render(null,true);Zb[A].isActive=true;Zb[A].render()}u(ta,function(s,W){if(!Rb||s>=ca&&s<=fa){V&&tb[s].isNew&&tb[s].render(W,true);
-tb[s].isActive=true;tb[s].render(W)}});r&&u(ta,function(s,W){if(W%2===0&&s<fa){fc[s]||(fc[s]=new x);fc[s].options={from:s,to:ta[W+1]!==Va?ta[W+1]:fa,color:r};fc[s].render();fc[s].isActive=true}});G||u((i.plotLines||[]).concat(i.plotBands||[]),function(s){Sb.push((new x(s)).render())})}u([tb,Zb,fc],function(s){for(var W in s)if(s[W].isActive)s[W].isActive=false;else{s[W].destroy();delete s[W]}});if(q){A=Y+(Ka?Ca:0)+P;U=Ua-sb-(Ka?xa:0)+P;A=ga.crispLine([ab,z?Y:A,z?U:ha,La,z?Ya-Hb:A,z?U:Ua-sb],q);if(ka)ka.animate({d:A});
-else ka=ga.path(A).attr({stroke:i.lineColor,"stroke-width":q,zIndex:7}).add()}if(v.axisTitle){A=z?Y:ha;q=ja(k.style.fontSize||12);A={low:A+(z?0:oa),middle:A+oa/2,high:A+(z?oa:0)}[k.align];q=(z?ha+xa:Y)+(z?1:-1)*(Ka?-1:1)*gd+(Z===2?q:0);v.axisTitle[G?"animate":"attr"]({x:z?A:q+(Ka?Ca:0)+P+(k.x||0),y:z?q-(Ka?xa:0)+P:A+(k.y||0)})}if(o&&o.enabled){var Ba,ma;o=v.stackTotalGroup;if(!o)v.stackTotalGroup=o=ga.g("stack-labels").attr({visibility:Ab,zIndex:6}).translate(Y,ha).add();for(Ba in t){k=t[Ba];for(ma in k)k[ma].render(o)}}v.isDirty=
-false}function Za(k){for(var o=Sb.length;o--;)Sb[o].id===k&&Sb[o].destroy()}var Ga=i.isX,Ka=i.opposite,z=qa?!Ga:Ga,Z=z?Ka?0:2:Ka?1:3,t={};i=va(Ga?Mc:hd,[Xd,Yd,Md,Zd][Z],i);var v=this,N=i.type,F=N==="datetime",H=N==="logarithmic",P=i.offset||0,$=Ga?"x":"y",oa,ua,fb,eb=z?Y:sb,Ib,Tb,gc,L,ka,T,ra,Fa,Ja,Oa,fa=null,ca=null,Gb,Ld,Jd=i.minPadding,Kd=i.maxPadding,Rb=M(i.linkedTo),Hd,Id,Jc;N=i.events;var id,Sb=[],Ta,Kc,Fb,ta,tb={},Zb={},fc={},hc,ic,gd,Lc,Xa=i.categories,$d=i.labels.formatter||function(){var k=
-this.value;return Lc?Nc(Lc,k):Ta%1E6===0?k/1E6+"M":Ta%1E3===0?k/1E3+"k":!Xa&&k>=1E3?zd(k,0):k},Oc=z&&i.labels.staggerLines,$b=i.reversed,ac=Xa&&i.tickmarkPlacement==="between"?0.5:0;y.prototype={addLabel:function(){var k=this.pos,o=i.labels,r=!(k===ca&&!C(i.showFirstLabel,1)||k===fa&&!C(i.showLastLabel,0)),q=Xa&&z&&Xa.length&&!o.step&&!o.staggerLines&&!o.rotation&&Ca/Xa.length||!z&&Ca/2,A=this.label;k=$d.call({isFirst:k===ta[0],isLast:k===ta[ta.length-1],dateTimeLabelFormat:Lc,value:Xa&&Xa[k]?Xa[k]:
-k});q=q&&{width:Ha(1,X(q-2*(o.padding||10)))+bb};q=pa(q,o.style);if(A===Va)this.label=M(k)&&r&&o.enabled?ga.text(k,0,0).attr({align:o.align,rotation:o.rotation}).css(q).add(gc):null;else A&&A.attr({text:k}).css(q)},getLabelSize:function(){var k=this.label;return k?(this.labelBBox=k.getBBox())[z?"height":"width"]:0},render:function(k,o){var r=!this.minor,q=this.label,A=this.pos,U=i.labels,G=this.gridLine,V=r?i.gridLineWidth:i.minorGridLineWidth,Ba=r?i.gridLineColor:i.minorGridLineColor,ma=r?i.gridLineDashStyle:
-i.minorGridLineDashStyle,s=this.mark,W=r?i.tickLength:i.minorTickLength,ba=r?i.tickWidth:i.minorTickWidth||0,ia=r?i.tickColor:i.minorTickColor,zb=r?i.tickPosition:i.minorTickPosition;r=U.step;var lb=o&&Pc||Ua,Nb;Nb=z?Ib(A+ac,null,null,o)+eb:Y+P+(Ka?(o&&jd||Ya)-Hb-Y:0);lb=z?lb-sb+P-(Ka?xa:0):lb-Ib(A+ac,null,null,o)-eb;if(V){A=Tb(A+ac,V,o);if(G===Va){G={stroke:Ba,"stroke-width":V};if(ma)G.dashstyle=ma;this.gridLine=G=V?ga.path(A).attr(G).add(L):null}G&&A&&G.animate({d:A})}if(ba){if(zb==="inside")W=
--W;if(Ka)W=-W;V=ga.crispLine([ab,Nb,lb,La,Nb+(z?0:-W),lb+(z?W:0)],ba);if(s)s.animate({d:V});else this.mark=ga.path(V).attr({stroke:ia,"stroke-width":ba}).add(gc)}if(q&&!isNaN(Nb)){Nb=Nb+U.x-(ac&&z?ac*ua*($b?-1:1):0);lb=lb+U.y-(ac&&!z?ac*ua*($b?1:-1):0);M(U.y)||(lb+=ja(q.styles.lineHeight)*0.9-q.getBBox().height/2);if(Oc)lb+=k/(r||1)%Oc*16;if(r)q[k%r?"hide":"show"]();q[this.isNew?"attr":"animate"]({x:Nb,y:lb})}this.isNew=false},destroy:function(){for(var k in this)this[k]&&this[k].destroy&&this[k].destroy()}};
-x.prototype={render:function(){var k=this,o=k.options,r=o.label,q=k.label,A=o.width,U=o.to,G,V=o.from,Ba=o.dashStyle,ma=k.svgElem,s=[],W,ba,ia=o.color;ba=o.zIndex;var zb=o.events;if(A){s=Tb(o.value,A);o={stroke:ia,"stroke-width":A};if(Ba)o.dashstyle=Ba}else if(M(V)&&M(U)){V=Ha(V,ca);U=qb(U,fa);G=Tb(U);if((s=Tb(V))&&G)s.push(G[4],G[5],G[1],G[2]);else s=null;o={fill:ia}}else return;if(M(ba))o.zIndex=ba;if(ma)if(s)ma.animate({d:s},null,ma.onGetPath);else{ma.hide();ma.onGetPath=function(){ma.show()}}else if(s&&
-s.length){k.svgElem=ma=ga.path(s).attr(o).add();if(zb){Ba=function(lb){ma.on(lb,function(Nb){zb[lb].apply(k,[Nb])})};for(W in zb)Ba(W)}}if(r&&M(r.text)&&s&&s.length&&Ca>0&&xa>0){r=va({align:z&&G&&"center",x:z?!G&&4:10,verticalAlign:!z&&G&&"middle",y:z?G?16:10:G?6:-4,rotation:z&&!G&&90},r);if(!q)k.label=q=ga.text(r.text,0,0).attr({align:r.textAlign||r.align,rotation:r.rotation,zIndex:ba}).css(r.style).add();G=[s[1],s[4],C(s[6],s[1])];s=[s[2],s[5],C(s[7],s[2])];W=qb.apply(sa,G);ba=qb.apply(sa,s);q.align(r,
-false,{x:W,y:ba,width:Ha.apply(sa,G)-W,height:Ha.apply(sa,s)-ba});q.show()}else q&&q.hide();return k},destroy:function(){for(var k in this){this[k]&&this[k].destroy&&this[k].destroy();delete this[k]}qc(Sb,this)}};Q.prototype={setTotal:function(k){this.cum=this.total=k},render:function(k){var o=this.options.formatter.call(this);if(this.label)this.label.attr({text:o,visibility:ub});else this.label=m.renderer.text(o,0,0).css(this.options.style).attr({align:this.textAlign,rotation:this.options.rotation,
-visibility:ub}).add(k)},setOffset:function(k,o){var r=this.isNegative,q=v.translate(this.total),A=v.translate(0);A=$a(q-A);var U=m.xAxis[0].translate(this.x)+k,G=m.plotHeight;r={x:qa?r?q:q-A:U,y:qa?G-U-o:r?G-q-A:G-q,width:qa?A:o,height:qa?o:A};this.label&&this.label.align(this.alignOptions,null,r).attr({visibility:Ab})}};Ib=function(k,o,r,q,A){var U=1,G=0,V=q?fb:ua;q=q?Gb:ca;V||(V=ua);if(r){U*=-1;G=oa}if($b){U*=-1;G-=U*oa}if(o){if($b)k=oa-k;k=k/V+q;if(H&&A)k=sa.pow(10,k)}else{if(H&&A)k=sa.log(k)/
-sa.LN10;k=U*(k-q)*V+G}return k};Tb=function(k,o,r){var q,A,U;k=Ib(k,null,null,r);var G=r&&Pc||Ua,V=r&&jd||Ya,Ba;r=A=X(k+eb);q=U=X(G-k-eb);if(isNaN(k))Ba=true;else if(z){q=ha;U=G-sb;if(r<Y||r>Y+Ca)Ba=true}else{r=Y;A=V-Hb;if(q<ha||q>ha+xa)Ba=true}return Ba?null:ga.crispLine([ab,r,q,La,A,U],o||0)};if(qa&&Ga&&$b===Va)$b=true;pa(v,{addPlotBand:Qa,addPlotLine:Qa,adjustTickAmount:function(){if(Mb&&!F&&!Xa&&!Rb){var k=hc,o=ta.length;hc=Mb[$];if(o<hc){for(;ta.length<hc;)ta.push(ea(ta[ta.length-1]+Ta));ua*=
-(o-1)/(hc-1);fa=ta[ta.length-1]}if(M(k)&&hc!==k)v.isDirty=true}},categories:Xa,getExtremes:function(){return{min:ca,max:fa,dataMin:T,dataMax:ra,userMin:Ja,userMax:Oa}},getPlotLinePath:Tb,getThreshold:function(k){if(ca>k)k=ca;else if(fa<k)k=fa;return Ib(k,0,1)},isXAxis:Ga,options:i,plotLinesAndBands:Sb,getOffset:function(){var k=Fa.length&&M(ca)&&M(fa),o=0,r=0,q=i.title,A=i.labels,U=[-1,1,1,-1][Z],G;if(!gc){gc=ga.g("axis").attr({zIndex:7}).add();L=ga.g("grid").attr({zIndex:1}).add()}ic=0;if(k||Rb){u(ta,
-function(V){if(tb[V])tb[V].addLabel();else tb[V]=new y(V);if(Z===0||Z===2||{1:"left",3:"right"}[Z]===A.align)ic=Ha(tb[V].getLabelSize(),ic)});if(Oc)ic+=(Oc-1)*16}else for(G in tb){tb[G].destroy();delete tb[G]}if(q&&q.text){if(!v.axisTitle)v.axisTitle=ga.text(q.text,0,0).attr({zIndex:7,rotation:q.rotation||0,align:q.textAlign||{low:"left",middle:"center",high:"right"}[q.align]}).css(q.style).add();o=v.axisTitle.getBBox()[z?"height":"width"];r=C(q.margin,z?5:10)}P=U*(i.offset||Ub[Z]);gd=ic+(Z!==2&&
-ic&&U*i.labels[z?"y":"x"])+r;Ub[Z]=Ha(Ub[Z],gd+o+U*P)},render:Ra,setCategories:function(k,o){v.categories=Xa=k;u(Fa,function(r){r.translate();r.setTooltipPoints(true)});v.isDirty=true;C(o,true)&&m.redraw()},setExtremes:function(k,o,r,q){r=C(r,true);Pa(v,"setExtremes",{min:k,max:o},function(){Ja=k;Oa=o;r&&m.redraw(q)})},setScale:Aa,setTickPositions:Ma,translate:Ib,redraw:function(){jc.resetTracker&&jc.resetTracker();Ra();u(Sb,function(k){k.render()});u(Fa,function(k){k.isDirty=true})},removePlotBand:Za,
-removePlotLine:Za,reversed:$b,stacks:t});for(id in N)Sa(v,id,N[id]);Aa()}function d(){var m={};return{add:function(i,y,x,Q){if(!m[i]){y=ga.text(y,0,0).css(a.toolbar.itemStyle).align({align:"right",x:-Hb-20,y:ha+30}).on("click",Q).attr({align:"right",zIndex:20}).add();m[i]=y}},remove:function(i){Gc(m[i].element);m[i]=null}}}function e(m){function i(){var F=this.points||rc(this),H=F[0].series.xAxis,P=this.x;H=H&&H.options.type==="datetime";var $=Pb(P)||H,oa;oa=$?['<span style="font-size: 10px">'+(H?
-Nc("%A, %b %e, %Y",P):P)+"</span>"]:[];u(F,function(ua){oa.push(ua.point.tooltipFormatter($))});return oa.join("<br/>")}function y(F,H){z=Za?F:(2*z+F)/3;Z=Za?H:(Z+H)/2;t.translate(z,Z);kd=$a(F-z)>1||$a(H-Z)>1?function(){y(F,H)}:null}function x(){if(!Za){var F=p.hoverPoints;t.hide();u(ea,function(H){H&&H.hide()});F&&u(F,function(H){H.setState()});p.hoverPoints=null;Za=true}}var Q,na=m.borderWidth,O=m.crosshairs,ea=[],Ma=m.style,Aa=m.shared,Qa=ja(Ma.padding),Ra=na+Qa,Za=true,Ga,Ka,z=0,Z=0;Ma.padding=
-0;var t=ga.g("tooltip").attr({zIndex:8}).add(),v=ga.rect(Ra,Ra,0,0,m.borderRadius,na).attr({fill:m.backgroundColor,"stroke-width":na}).add(t).shadow(m.shadow),N=ga.text("",Qa+Ra,ja(Ma.fontSize)+Qa+Ra).attr({zIndex:1}).css(Ma).add(t);t.hide();return{shared:Aa,refresh:function(F){var H,P,$,oa=0,ua={},fb=[];$=F.tooltipPos;H=m.formatter||i;ua=p.hoverPoints;if(Aa){ua&&u(ua,function(eb){eb.setState()});p.hoverPoints=F;u(F,function(eb){eb.setState(Bb);oa+=eb.plotY;fb.push(eb.getLabelConfig())});P=F[0].plotX;
-oa=X(oa)/F.length;ua={x:F[0].category};ua.points=fb;F=F[0]}else ua=F.getLabelConfig();ua=H.call(ua);Q=F.series;P=Aa?P:F.plotX;oa=Aa?oa:F.plotY;H=X($?$[0]:qa?Ca-oa:P);P=X($?$[1]:qa?xa-P:oa);$=Aa||!F.series.isCartesian||kc(H,P);if(ua===false||!$)x();else{if(Za){t.show();Za=false}N.attr({text:ua});$=N.getBBox();Ga=$.width+2*Qa;Ka=$.height+2*Qa;v.attr({width:Ga,height:Ka,stroke:m.borderColor||F.color||Q.color||"#606060"});$=H-Ga+Y-25;P=P-Ka+ha+10;if($<7)$=Y+H+15;if(P<5)P=5;else if(P+Ka>Ua)P=Ua-Ka-5;y(X($-
-Ra),X(P-Ra))}if(O){O=rc(O);for(H=O.length;H--;){P=F.series[H?"yAxis":"xAxis"];if(O[H]&&P){P=P.getPlotLinePath(F[H?"y":"x"],1);if(ea[H])ea[H].attr({d:P,visibility:Ab});else{$={"stroke-width":O[H].width||1,stroke:O[H].color||"#C0C0C0",zIndex:2};if(O[H].dashStyle)$.dashstyle=O[H].dashStyle;ea[H]=ga.path(P).attr($).add()}}}}},hide:x}}function f(m,i){function y(z){var Z,t=Nd&&wa.width/wa.documentElement.clientWidth-1,v,N,F;z=z||cb.event;if(!z.target)z.target=z.srcElement;Z=z.touches?z.touches.item(0):
-z;if(z.type!=="mousemove"||cb.opera||t){v=ya;N={left:v.offsetLeft,top:v.offsetTop};for(v=v.offsetParent;v;){N.left+=v.offsetLeft;N.top+=v.offsetTop;if(v!==wa.body&&v!==wa.documentElement){N.left-=v.scrollLeft;N.top-=v.scrollTop}v=v.offsetParent}tc=N;v=tc.left;N=tc.top}if(Bc){F=z.x;Z=z.y}else if(Z.layerX===Va){F=Z.pageX-v;Z=Z.pageY-N}else{F=z.layerX;Z=z.layerY}if(t){F+=X((t+1)*v-v);Z+=X((t+1)*N-N)}return pa(z,{chartX:F,chartY:Z})}function x(z){var Z={xAxis:[],yAxis:[]};u(db,function(t){var v=t.translate,
-N=t.isXAxis;Z[N?"xAxis":"yAxis"].push({axis:t,value:v((qa?!N:N)?z.chartX-Y:xa-z.chartY+ha,true)})});return Z}function Q(){var z=m.hoverSeries,Z=m.hoverPoint;Z&&Z.onMouseOut();z&&z.onMouseOut();uc&&uc.hide();ld=null}function na(){if(Aa){var z={xAxis:[],yAxis:[]},Z=Aa.getBBox(),t=Z.x-Y,v=Z.y-ha;if(Ma){u(db,function(N){var F=N.translate,H=N.isXAxis,P=qa?!H:H,$=F(P?t:xa-v-Z.height,true,0,0,1);F=F(P?t+Z.width:xa-v,true,0,0,1);z[H?"xAxis":"yAxis"].push({axis:N,min:qb($,F),max:Ha($,F)})});Pa(m,"selection",
-z,md)}Aa=Aa.destroy()}m.mouseIsDown=nd=Ma=false;Cb(wa,Jb?"touchend":"mouseup",na)}var O,ea,Ma,Aa,Qa=w.zoomType,Ra=/x/.test(Qa),Za=/y/.test(Qa),Ga=Ra&&!qa||Za&&qa,Ka=Za&&!qa||Ra&&qa;Qc=function(){if(Rc){Rc.translate(Y,ha);qa&&Rc.attr({width:m.plotWidth,height:m.plotHeight}).invert()}else m.trackerGroup=Rc=ga.g("tracker").attr({zIndex:9}).add()};Qc();if(i.enabled)m.tooltip=uc=e(i);(function(){var z=true;ya.onmousedown=function(t){t=y(t);!Jb&&t.preventDefault&&t.preventDefault();m.mouseIsDown=nd=true;
-O=t.chartX;ea=t.chartY;Sa(wa,Jb?"touchend":"mouseup",na)};var Z=function(t){if(!(t&&t.touches&&t.touches.length>1)){t=y(t);if(!Jb)t.returnValue=false;var v=t.chartX,N=t.chartY,F=!kc(v-Y,N-ha);if(Jb&&t.type==="touchstart")if(Ea(t.target,"isTracker"))m.runTrackerClick||t.preventDefault();else!ae&&!F&&t.preventDefault();if(F){z||Q();if(v<Y)v=Y;else if(v>Y+Ca)v=Y+Ca;if(N<ha)N=ha;else if(N>ha+xa)N=ha+xa}if(nd&&t.type!=="touchstart"){Ma=Math.sqrt(Math.pow(O-v,2)+Math.pow(ea-N,2));if(Ma>10){if(lc&&(Ra||
-Za)&&kc(O-Y,ea-ha))Aa||(Aa=ga.rect(Y,ha,Ga?1:Ca,Ka?1:xa,0).attr({fill:"rgba(69,114,167,0.25)",zIndex:7}).add());if(Aa&&Ga){v=v-O;Aa.attr({width:$a(v),x:(v>0?0:v)+O})}if(Aa&&Ka){N=N-ea;Aa.attr({height:$a(N),y:(N>0?0:N)+ea})}}}else if(!F){var H;N=m.hoverPoint;v=m.hoverSeries;var P,$,oa=Ya,ua=qa?t.chartY:t.chartX-Y;if(uc&&i.shared){H=[];P=Ia.length;for($=0;$<P;$++)if(Ia[$].visible&&Ia[$].tooltipPoints.length){t=Ia[$].tooltipPoints[ua];t._dist=$a(ua-t.plotX);oa=qb(oa,t._dist);H.push(t)}for(P=H.length;P--;)H[P]._dist>
-oa&&H.splice(P,1);if(H.length&&H[0].plotX!==ld){uc.refresh(H);ld=H[0].plotX}}if(v&&v.tracker)(t=v.tooltipPoints[ua])&&t!==N&&t.onMouseOver()}return(z=F)||!lc}};ya.onmousemove=Z;Sa(ya,"mouseleave",Q);ya.ontouchstart=function(t){if(Ra||Za)ya.onmousedown(t);Z(t)};ya.ontouchmove=Z;ya.ontouchend=function(){Ma&&Q()};ya.onclick=function(t){var v=m.hoverPoint;t=y(t);t.cancelBubble=true;if(!Ma)if(v&&Ea(t.target,"isTracker")){var N=v.plotX,F=v.plotY;pa(v,{pageX:tc.left+Y+(qa?Ca-F:N),pageY:tc.top+ha+(qa?xa-
-N:F)});Pa(v.series,"click",pa(t,{point:v}));v.firePointEvent("click",t)}else{pa(t,x(t));kc(t.chartX-Y,t.chartY-ha)&&Pa(m,"click",t)}Ma=false}})();Od=setInterval(function(){kd&&kd()},32);pa(this,{zoomX:Ra,zoomY:Za,resetTracker:Q})}function g(m){var i=m.type||w.type||w.defaultSeriesType,y=vb[i],x=p.hasRendered;if(x)if(qa&&i==="column")y=vb.bar;else if(!qa&&i==="bar")y=vb.column;i=new y;i.init(p,m);if(!x&&i.inverted)qa=true;if(i.isCartesian)lc=i.isCartesian;Ia.push(i);return i}function h(){w.alignTicks!==
-false&&u(db,function(m){m.adjustTickAmount()});Mb=null}function j(m){var i=p.isDirtyLegend,y,x=p.isDirtyBox,Q=Ia.length,na=Q,O=p.clipRect;for(ec(m,p);na--;){m=Ia[na];if(m.isDirty&&m.options.stacking){y=true;break}}if(y)for(na=Q;na--;){m=Ia[na];if(m.options.stacking)m.isDirty=true}u(Ia,function(ea){if(ea.isDirty){ea.cleanData();ea.getSegments();if(ea.options.legendType==="point")i=true}});if(i&&od.renderLegend){od.renderLegend();p.isDirtyLegend=false}if(lc){if(!Sc){Mb=null;u(db,function(ea){ea.setScale()})}h();
-vc();u(db,function(ea){if(ea.isDirty||x){ea.redraw();x=true}})}if(x){pd();Qc();if(O){Tc(O);O.animate({width:p.plotSizeX,height:p.plotSizeY})}}u(Ia,function(ea){if(ea.isDirty&&ea.visible&&(!ea.isCartesian||ea.xAxis))ea.redraw()});jc&&jc.resetTracker&&jc.resetTracker();Pa(p,"redraw")}function l(){var m=a.xAxis||{},i=a.yAxis||{},y;m=rc(m);u(m,function(x,Q){x.index=Q;x.isX=true});i=rc(i);u(i,function(x,Q){x.index=Q});db=m.concat(i);p.xAxis=[];p.yAxis=[];db=mc(db,function(x){y=new c(p,x);p[y.isXAxis?"xAxis":
-"yAxis"].push(y);return y});h()}function n(m,i){Kb=va(a.title,m);wc=va(a.subtitle,i);u([["title",m,Kb],["subtitle",i,wc]],function(y){var x=y[0],Q=p[x],na=y[1];y=y[2];if(Q&&na){Q.destroy();Q=null}if(y&&y.text&&!Q)p[x]=ga.text(y.text,0,0).attr({align:y.align,"class":"highcharts-"+x,zIndex:1}).css(y.style).add().align(y,false,Ob)})}function J(){mb=w.renderTo;Pd=nc+qd++;if(Pb(mb))mb=wa.getElementById(mb);mb.innerHTML="";if(!mb.offsetWidth){Vb=mb.cloneNode(0);Na(Vb,{position:oc,top:"-9999px",display:""});
-wa.body.appendChild(Vb)}Uc=(Vb||mb).offsetWidth;xc=(Vb||mb).offsetHeight;p.chartWidth=Ya=w.width||Uc||600;p.chartHeight=Ua=w.height||(xc>19?xc:400);p.container=ya=ib(Qb,{className:"highcharts-container"+(w.className?" "+w.className:""),id:Pd},pa({position:Qd,overflow:ub,width:Ya+bb,height:Ua+bb,textAlign:"left"},w.style),Vb||mb);p.renderer=ga=w.forExport?new Vc(ya,Ya,Ua,true):new Wc(ya,Ya,Ua);var m,i;if(Rd&&ya.getBoundingClientRect){m=function(){Na(ya,{left:0,top:0});i=ya.getBoundingClientRect();
-Na(ya,{left:-(i.left-ja(i.left))+bb,top:-(i.top-ja(i.top))+bb})};m();Sa(cb,"resize",m);Sa(p,"destroy",function(){Cb(cb,"resize",m)})}}function D(){function m(){var y=w.width||mb.offsetWidth,x=w.height||mb.offsetHeight;if(y&&x){if(y!==Uc||x!==xc){clearTimeout(i);i=setTimeout(function(){rd(y,x,false)},100)}Uc=y;xc=x}}var i;Sa(cb,"resize",m);Sa(p,"destroy",function(){Cb(cb,"resize",m)})}function aa(){var m=a.labels,i=a.credits,y;n();od=p.legend=new be(p);vc();u(db,function(x){x.setTickPositions(true)});
-h();vc();pd();lc&&u(db,function(x){x.render()});if(!p.seriesGroup)p.seriesGroup=ga.g("series-group").attr({zIndex:3}).add();u(Ia,function(x){x.translate();x.setTooltipPoints();x.render()});m.items&&u(m.items,function(){var x=pa(m.style,this.style),Q=ja(x.left)+Y,na=ja(x.top)+ha+12;delete x.left;delete x.top;ga.text(this.html,Q,na).attr({zIndex:2}).css(x).add()});if(!p.toolbar)p.toolbar=d(p);if(i.enabled&&!p.credits){y=i.href;ga.text(i.text,0,0).on("click",function(){if(y)location.href=y}).attr({align:i.position.align,
-zIndex:8}).css(i.style).add().align(i.position)}Qc();p.hasRendered=true;if(Vb){mb.appendChild(ya);Gc(Vb)}}function E(){var m=Ia.length,i=ya&&ya.parentNode;Pa(p,"destroy");Cb(cb,"unload",E);Cb(p);for(u(db,function(y){Cb(y)});m--;)Ia[m].destroy();if(ya){ya.innerHTML="";Cb(ya);i&&i.removeChild(ya);ya=null}if(ga)ga.alignedObjects=null;clearInterval(Od);for(m in p)delete p[m]}function da(){if(!yc&&cb==cb.top&&wa.readyState!=="complete")wa.attachEvent("onreadystatechange",function(){wa.detachEvent("onreadystatechange",
-da);wa.readyState==="complete"&&da()});else{J();sd();td();u(a.series||[],function(m){g(m)});p.inverted=qa=C(qa,a.chart.inverted);l();p.render=aa;p.tracker=jc=new f(p,a.tooltip);aa();Pa(p,"load");b&&b.apply(p,[p]);u(p.callbacks,function(m){m.apply(p,[p])})}}Mc=va(Mc,Wa.xAxis);hd=va(hd,Wa.yAxis);Wa.xAxis=Wa.yAxis=null;a=va(Wa,a);var w=a.chart,R=w.margin;R=Lb(R)?R:[R,R,R,R];var B=C(w.marginTop,R[0]),K=C(w.marginRight,R[1]),S=C(w.marginBottom,R[2]),I=C(w.marginLeft,R[3]),za=w.spacingTop,Da=w.spacingRight,
-gb=w.spacingBottom,wb=w.spacingLeft,Ob,Kb,wc,ha,Hb,sb,Y,Ub,mb,Vb,ya,Pd,Uc,xc,Ya,Ua,jd,Pc,Xc,ud,vd,Yc,p=this,ae=(R=w.events)&&!!R.click,wd,kc,uc,nd,bc,Sd,xd,xa,Ca,jc,Rc,Qc,od,Wb,Xb,tc,lc=w.showAxes,Sc=0,db=[],Mb,Ia=[],qa,ga,kd,Od,ld,pd,vc,sd,td,rd,md,Td,be=function(m){function i(L,ka){var T=L.legendItem,ra=L.legendLine,Fa=L.legendSymbol,Ja=Ka.color,Oa=ka?O.itemStyle.color:Ja,fa=ka?L.color:Ja;Ja=ka?L.pointAttr[hb]:{stroke:Ja,fill:Ja};T&&T.css({fill:Oa});ra&&ra.attr({stroke:fa});Fa&&Fa.attr(Ja)}function y(L,
-ka,T){var ra=L.legendItem,Fa=L.legendLine,Ja=L.legendSymbol;L=L.checkbox;ra&&ra.attr({x:ka,y:T});Fa&&Fa.translate(ka,T-4);Ja&&Ja.attr({x:ka+Ja.xOff,y:T+Ja.yOff});if(L){L.x=ka;L.y=T}}function x(){u(Qa,function(L){var ka=L.checkbox,T=fb.alignAttr;ka&&Na(ka,{left:T.translateX+L.legendItemWidth+ka.x-40+bb,top:T.translateY+ka.y-11+bb})})}function Q(L){var ka,T,ra,Fa,Ja=L.legendItem;Fa=L.series||L;var Oa=Fa.options,fa=Oa&&Oa.borderWidth||0;if(!Ja){Fa=/^(bar|pie|area|column)$/.test(Fa.type);L.legendItem=
-Ja=ga.text(O.labelFormatter.call(L),0,0).css(L.visible?Za:Ka).on("mouseover",function(){L.setState(Bb);Ja.css(Ga)}).on("mouseout",function(){Ja.css(L.visible?Za:Ka);L.setState()}).on("click",function(){var Gb=function(){L.setVisible()};L.firePointEvent?L.firePointEvent("legendItemClick",null,Gb):Pa(L,"legendItemClick",null,Gb)}).attr({zIndex:2}).add(fb);if(!Fa&&Oa&&Oa.lineWidth){var ca={"stroke-width":Oa.lineWidth,zIndex:2};if(Oa.dashStyle)ca.dashstyle=Oa.dashStyle;L.legendLine=ga.path([ab,-Ma-Aa,
-0,La,-Aa,0]).attr(ca).add(fb)}if(Fa)ka=ga.rect(T=-Ma-Aa,ra=-11,Ma,12,2).attr({zIndex:3}).add(fb);else if(Oa&&Oa.marker&&Oa.marker.enabled)ka=ga.symbol(L.symbol,T=-Ma/2-Aa,ra=-4,Oa.marker.radius).attr({zIndex:3}).add(fb);if(ka){ka.xOff=T+fa%2/2;ka.yOff=ra+fa%2/2}L.legendSymbol=ka;i(L,L.visible);if(Oa&&Oa.showCheckbox){L.checkbox=ib("input",{type:"checkbox",checked:L.selected,defaultChecked:L.selected},O.itemCheckboxStyle,ya);Sa(L.checkbox,"click",function(Gb){Pa(L,"checkboxClick",{checked:Gb.target.checked},
-function(){L.select()})})}}ka=Ja.getBBox();T=L.legendItemWidth=O.itemWidth||Ma+Aa+ka.width+Z;P=ka.height;if(ea&&N-v+T>(Ib||Ya-2*z-v)){N=v;F+=P}H=F;y(L,N,F);if(ea)N+=T;else F+=P;eb=Ib||Ha(ea?N-v:T,eb)}function na(){N=v;F=t;H=eb=0;fb||(fb=ga.g("legend").attr({zIndex:7}).add());Qa=[];u(Tb,function(ra){var Fa=ra.options;if(Fa.showInLegend)Qa=Qa.concat(Fa.legendType==="point"?ra.data:ra)});Qa.sort(function(ra,Fa){return(ra.options.legendIndex||0)-(Fa.options.legendIndex||0)});gc&&Qa.reverse();u(Qa,Q);
-Wb=Ib||eb;Xb=H-t+P;if(oa||ua){Wb+=2*z;Xb+=2*z;if($)Wb>0&&Xb>0&&$.animate($.crisp(null,null,null,Wb,Xb));else $=ga.rect(0,0,Wb,Xb,O.borderRadius,oa||0).attr({stroke:O.borderColor,"stroke-width":oa||0,fill:ua||jb}).add(fb).shadow(O.shadow);$[Qa.length?"show":"hide"]()}for(var L=["left","right","top","bottom"],ka,T=4;T--;){ka=L[T];if(Ra[ka]&&Ra[ka]!=="auto"){O[T<2?"align":"verticalAlign"]=ka;O[T<2?"x":"y"]=ja(Ra[ka])*(T%2?-1:1)}}fb.align(pa(O,{width:Wb,height:Xb}),true,Ob);Sc||x()}var O=m.options.legend;
-if(O.enabled){var ea=O.layout==="horizontal",Ma=O.symbolWidth,Aa=O.symbolPadding,Qa,Ra=O.style,Za=O.itemStyle,Ga=O.itemHoverStyle,Ka=O.itemHiddenStyle,z=ja(Ra.padding),Z=20,t=18,v=4+z+Ma+Aa,N,F,H,P=0,$,oa=O.borderWidth,ua=O.backgroundColor,fb,eb,Ib=O.width,Tb=m.series,gc=O.reversed;na();Sa(m,"endResize",x);return{colorizeItem:i,destroyItem:function(L){var ka=L.checkbox;u(["legendItem","legendLine","legendSymbol"],function(T){L[T]&&L[T].destroy()});ka&&Gc(L.checkbox)},renderLegend:na}}};kc=function(m,
-i){return m>=0&&m<=Ca&&i>=0&&i<=xa};Td=function(){Pa(p,"selection",{resetSelection:true},md);p.toolbar.remove("zoom")};md=function(m){var i=Wa.lang,y=p.pointCount<100;p.toolbar.add("zoom",i.resetZoom,i.resetZoomTitle,Td);!m||m.resetSelection?u(db,function(x){x.setExtremes(null,null,false,y)}):u(m.xAxis.concat(m.yAxis),function(x){var Q=x.axis;if(p.tracker[Q.isXAxis?"zoomX":"zoomY"])Q.setExtremes(x.min,x.max,false,y)});j()};vc=function(){var m=a.legend,i=C(m.margin,10),y=m.x,x=m.y,Q=m.align,na=m.verticalAlign,
-O;sd();if((p.title||p.subtitle)&&!M(B))if(O=Ha(p.title&&!Kb.floating&&!Kb.verticalAlign&&Kb.y||0,p.subtitle&&!wc.floating&&!wc.verticalAlign&&wc.y||0))ha=Ha(ha,O+C(Kb.margin,15)+za);if(m.enabled&&!m.floating)if(Q==="right")M(K)||(Hb=Ha(Hb,Wb-y+i+Da));else if(Q==="left")M(I)||(Y=Ha(Y,Wb+y+i+wb));else if(na==="top")M(B)||(ha=Ha(ha,Xb+x+i+za));else if(na==="bottom")M(S)||(sb=Ha(sb,Xb-x+i+gb));lc&&u(db,function(ea){ea.getOffset()});M(I)||(Y+=Ub[3]);M(B)||(ha+=Ub[0]);M(S)||(sb+=Ub[2]);M(K)||(Hb+=Ub[1]);
-td()};rd=function(m,i,y){var x=p.title,Q=p.subtitle;Sc+=1;ec(y,p);Pc=Ua;jd=Ya;p.chartWidth=Ya=X(m);p.chartHeight=Ua=X(i);Na(ya,{width:Ya+bb,height:Ua+bb});ga.setSize(Ya,Ua,y);Ca=Ya-Y-Hb;xa=Ua-ha-sb;Mb=null;u(db,function(na){na.isDirty=true;na.setScale()});u(Ia,function(na){na.isDirty=true});p.isDirtyLegend=true;p.isDirtyBox=true;vc();x&&x.align(null,null,Ob);Q&&Q.align(null,null,Ob);j(y);Pc=null;Pa(p,"resize");setTimeout(function(){Pa(p,"endResize",null,function(){Sc-=1})},Cc&&Cc.duration||500)};
-td=function(){p.plotLeft=Y=X(Y);p.plotTop=ha=X(ha);p.plotWidth=Ca=X(Ya-Y-Hb);p.plotHeight=xa=X(Ua-ha-sb);p.plotSizeX=qa?xa:Ca;p.plotSizeY=qa?Ca:xa;Ob={x:wb,y:za,width:Ya-wb-Da,height:Ua-za-gb}};sd=function(){ha=C(B,za);Hb=C(K,Da);sb=C(S,gb);Y=C(I,wb);Ub=[0,0,0,0]};pd=function(){var m=w.borderWidth||0,i=w.backgroundColor,y=w.plotBackgroundColor,x=w.plotBackgroundImage,Q,na={x:Y,y:ha,width:Ca,height:xa};Q=m+(w.shadow?8:0);if(m||i)if(Xc)Xc.animate(Xc.crisp(null,null,null,Ya-Q,Ua-Q));else Xc=ga.rect(Q/
-2,Q/2,Ya-Q,Ua-Q,w.borderRadius,m).attr({stroke:w.borderColor,"stroke-width":m,fill:i||jb}).add().shadow(w.shadow);if(y)if(ud)ud.animate(na);else ud=ga.rect(Y,ha,Ca,xa,0).attr({fill:y}).add().shadow(w.plotShadow);if(x)if(vd)vd.animate(na);else vd=ga.image(x,Y,ha,Ca,xa).add();if(w.plotBorderWidth)if(Yc)Yc.animate(Yc.crisp(null,Y,ha,Ca,xa));else Yc=ga.rect(Y,ha,Ca,xa,0,w.plotBorderWidth).attr({stroke:w.plotBorderColor,"stroke-width":w.plotBorderWidth,zIndex:4}).add();p.isDirtyBox=false};Sa(cb,"unload",
-E);w.reflow!==false&&Sa(p,"load",D);if(R)for(wd in R)Sa(p,wd,R[wd]);p.options=a;p.series=Ia;p.addSeries=function(m,i,y){var x;if(m){ec(y,p);i=C(i,true);Pa(p,"addSeries",{options:m},function(){x=g(m);x.isDirty=true;p.isDirtyLegend=true;i&&p.redraw()})}return x};p.animation=C(w.animation,true);p.destroy=E;p.get=function(m){var i,y,x;for(i=0;i<db.length;i++)if(db[i].options.id===m)return db[i];for(i=0;i<Ia.length;i++)if(Ia[i].options.id===m)return Ia[i];for(i=0;i<Ia.length;i++){x=Ia[i].data;for(y=0;y<
-x.length;y++)if(x[y].id===m)return x[y]}return null};p.getSelectedPoints=function(){var m=[];u(Ia,function(i){m=m.concat(yd(i.data,function(y){return y.selected}))});return m};p.getSelectedSeries=function(){return yd(Ia,function(m){return m.selected})};p.hideLoading=function(){Zc(bc,{opacity:0},{duration:a.loading.hideDuration,complete:function(){Na(bc,{display:jb})}});xd=false};p.isInsidePlot=kc;p.redraw=j;p.setSize=rd;p.setTitle=n;p.showLoading=function(m){var i=a.loading;if(!bc){bc=ib(Qb,{className:"highcharts-loading"},
-pa(i.style,{left:Y+bb,top:ha+bb,width:Ca+bb,height:xa+bb,zIndex:10,display:jb}),ya);Sd=ib("span",null,i.labelStyle,bc)}Sd.innerHTML=m||a.lang.loading;if(!xd){Na(bc,{opacity:0,display:""});Zc(bc,{opacity:i.style.opacity},{duration:i.showDuration});xd=true}};p.pointCount=0;p.counters=new Ad;da()}var wa=document,cb=window,sa=Math,X=sa.round,kb=sa.floor,fd=sa.ceil,Ha=sa.max,qb=sa.min,$a=sa.abs,nb=sa.cos,Db=sa.sin,cc=sa.PI,Ud=cc*2/360,pc=navigator.userAgent,Bc=/msie/i.test(pc)&&!cb.opera,zc=wa.documentMode===
-8,Nd=/AppleWebKit/.test(pc),Rd=/Firefox/.test(pc),yc=!!wa.createElementNS&&!!wa.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect,Wc,Jb=wa.documentElement.ontouchstart!==undefined,Vd={},qd=0,rb=1,Hc,Wa,Nc,Cc,$c,Va,Qb="div",oc="absolute",Qd="relative",ub="hidden",nc="highcharts-",Ab="visible",bb="px",jb="none",ab="M",La="L",Wd="rgba(192,192,192,"+(yc?1.0E-6:0.0020)+")",hb="",Bb="hover",Dc,bd,cd,dd,sc,Ec,Fc,Cd,Dd,ed,Ed,Fd,la=cb.HighchartsAdapter,Eb=la||{},u=Eb.each,yd=Eb.grep,mc=Eb.map,
-va=Eb.merge,Sa=Eb.addEvent,Cb=Eb.removeEvent,Pa=Eb.fireEvent,Zc=Eb.animate,Tc=Eb.stop,vb={};Nc=function(a,b,c){function d(D){return D.toString().replace(/^([0-9])$/,"0$1")}if(!M(b)||isNaN(b))return"Invalid date";a=C(a,"%Y-%m-%d %H:%M:%S");b=new Date(b*rb);var e,f=b[cd](),g=b[dd](),h=b[sc](),j=b[Ec](),l=b[Fc](),n=Wa.lang,J=n.weekdays;n=n.months;b={a:J[g].substr(0,3),A:J[g],d:d(h),e:h,b:n[j].substr(0,3),B:n[j],m:d(j+1),y:l.toString().substr(2,2),Y:l,H:d(f),I:d(f%12||12),l:f%12||12,M:d(b[bd]()),p:f<
-12?"AM":"PM",P:f<12?"am":"pm",S:d(b.getSeconds())};for(e in b)a=a.replace("%"+e,b[e]);return c?a.substr(0,1).toUpperCase()+a.substr(1):a};Ad.prototype={wrapColor:function(a){if(this.color>=a)this.color=0},wrapSymbol:function(a){if(this.symbol>=a)this.symbol=0}};la&&la.init&&la.init();if(!la&&cb.jQuery){var ob=jQuery;u=function(a,b){for(var c=0,d=a.length;c<d;c++)if(b.call(a[c],a[c],c,a)===false)return c};yd=ob.grep;mc=function(a,b){for(var c=[],d=0,e=a.length;d<e;d++)c[d]=b.call(a[d],a[d],d,a);return c};
-va=function(){var a=arguments;return ob.extend(true,null,a[0],a[1],a[2],a[3])};Sa=function(a,b,c){ob(a).bind(b,c)};Cb=function(a,b,c){var d=wa.removeEventListener?"removeEventListener":"detachEvent";if(wa[d]&&!a[d])a[d]=function(){};ob(a).unbind(b,c)};Pa=function(a,b,c,d){var e=ob.Event(b),f="detached"+b;pa(e,c);if(a[b]){a[f]=a[b];a[b]=null}ob(a).trigger(e);if(a[f]){a[b]=a[f];a[f]=null}d&&!e.isDefaultPrevented()&&d(e)};Zc=function(a,b,c){var d=ob(a);if(b.d){a.toD=b.d;b.d=1}d.stop();d.animate(b,c)};
-Tc=function(a){ob(a).stop()};ob.extend(ob.easing,{easeOutQuad:function(a,b,c,d,e){return-d*(b/=e)*(b-2)+c}});var ce=jQuery.fx.step._default,de=jQuery.fx.prototype.cur;ob.fx.step._default=function(a){var b=a.elem;b.attr?b.attr(a.prop,a.now):ce.apply(this,arguments)};ob.fx.step.d=function(a){var b=a.elem;if(!a.started){var c=$c.init(b,b.d,b.toD);a.start=c[0];a.end=c[1];a.started=true}b.attr("d",$c.step(a.start,a.end,a.pos,b.toD))};ob.fx.prototype.cur=function(){var a=this.elem;return a.attr?a.attr(this.prop):
-de.apply(this,arguments)}}$c={init:function(a,b,c){b=b||"";var d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g;b=b.split(" ");c=[].concat(c);var h,j,l=function(n){for(g=n.length;g--;)n[g]===ab&&n.splice(g+1,0,n[g+1],n[g+2],n[g+1],n[g+2])};if(e){l(b);l(c)}if(a.isArea){h=b.splice(b.length-6,6);j=c.splice(c.length-6,6)}if(d){c=[].concat(c).splice(0,f).concat(c);a.shift=false}if(b.length)for(a=c.length;b.length<a;){d=[].concat(b).splice(b.length-f,f);if(e){d[f-6]=d[f-2];d[f-5]=d[f-1]}b=b.concat(d)}if(h){b=b.concat(h);
-c=c.concat(j)}return[b,c]},step:function(a,b,c,d){var e=[],f=a.length;if(c===1)e=d;else if(f===b.length&&c<1)for(;f--;){d=parseFloat(a[f]);e[f]=isNaN(d)?a[f]:c*parseFloat(b[f]-d)+d}else e=b;return e}};la={enabled:true,align:"center",x:0,y:15,style:{color:"#666",fontSize:"11px",lineHeight:"14px"}};Wa={colors:["#4572A7","#AA4643","#89A54E","#80699B","#3D96AE","#DB843D","#92A8CD","#A47D7C","#B5CA92"],symbols:["circle","diamond","square","triangle","triangle-down"],lang:{loading:"Loading...",months:["January",
-"February","March","April","May","June","July","August","September","October","November","December"],weekdays:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],decimalPoint:".",resetZoom:"Reset zoom",resetZoomTitle:"Reset zoom level 1:1",thousandsSep:","},global:{useUTC:true},chart:{borderColor:"#4572A7",borderRadius:5,defaultSeriesType:"line",ignoreHiddenSeries:true,spacingTop:10,spacingRight:10,spacingBottom:15,spacingLeft:10,style:{fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, Helvetica, sans-serif',
-fontSize:"12px"},backgroundColor:"#FFFFFF",plotBorderColor:"#C0C0C0"},title:{text:"Chart title",align:"center",y:15,style:{color:"#3E576F",fontSize:"16px"}},subtitle:{text:"",align:"center",y:30,style:{color:"#6D869F"}},plotOptions:{line:{allowPointSelect:false,showCheckbox:false,animation:{duration:1E3},events:{},lineWidth:2,shadow:true,marker:{enabled:true,lineWidth:0,radius:4,lineColor:"#FFFFFF",states:{hover:{},select:{fillColor:"#FFFFFF",lineColor:"#000000",lineWidth:2}}},point:{events:{}},dataLabels:va(la,
-{enabled:false,y:-6,formatter:function(){return this.y}}),showInLegend:true,states:{hover:{marker:{}},select:{marker:{}}},stickyTracking:true}},labels:{style:{position:oc,color:"#3E576F"}},legend:{enabled:true,align:"center",layout:"horizontal",labelFormatter:function(){return this.name},borderWidth:1,borderColor:"#909090",borderRadius:5,shadow:false,style:{padding:"5px"},itemStyle:{cursor:"pointer",color:"#3E576F"},itemHoverStyle:{cursor:"pointer",color:"#000000"},itemHiddenStyle:{color:"#C0C0C0"},
-itemCheckboxStyle:{position:oc,width:"13px",height:"13px"},symbolWidth:16,symbolPadding:5,verticalAlign:"bottom",x:0,y:0},loading:{hideDuration:100,labelStyle:{fontWeight:"bold",position:Qd,top:"1em"},showDuration:100,style:{position:oc,backgroundColor:"white",opacity:0.5,textAlign:"center"}},tooltip:{enabled:true,backgroundColor:"rgba(255, 255, 255, .85)",borderWidth:2,borderRadius:5,shadow:true,snap:Jb?25:10,style:{color:"#333333",fontSize:"12px",padding:"5px",whiteSpace:"nowrap"}},toolbar:{itemStyle:{color:"#4572A7",
-cursor:"pointer"}},credits:{enabled:true,text:"Highcharts.com",href:"http://www.highcharts.com",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"10px"}}};var Mc={dateTimeLabelFormats:{second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:false,gridLineColor:"#C0C0C0",labels:la,lineColor:"#C0D0E0",lineWidth:1,max:null,min:null,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",
-minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:false,tickColor:"#C0D0E0",tickLength:5,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#6D869F",fontWeight:"bold"}},type:"linear"},hd=va(Mc,{endOnTick:true,gridLineWidth:1,tickPixelInterval:72,showLastLabel:true,labels:{align:"right",x:-8,y:3},lineWidth:0,maxPadding:0.05,minPadding:0.05,startOnTick:true,tickWidth:0,
-title:{rotation:270,text:"Y-values"},stackLabels:{enabled:false,formatter:function(){return this.total},style:la.style}}),Zd={labels:{align:"right",x:-8,y:null},title:{rotation:270}},Yd={labels:{align:"left",x:8,y:null},title:{rotation:90}},Md={labels:{align:"center",x:0,y:14},title:{rotation:0}},Xd=va(Md,{labels:{y:-5}}),xb=Wa.plotOptions;la=xb.line;xb.spline=va(la);xb.scatter=va(la,{lineWidth:0,states:{hover:{lineWidth:0}}});xb.area=va(la,{});xb.areaspline=va(xb.area);xb.column=va(la,{borderColor:"#FFFFFF",
-borderWidth:1,borderRadius:0,groupPadding:0.2,marker:null,pointPadding:0.1,minPointLength:0,states:{hover:{brightness:0.1,shadow:false},select:{color:"#C0C0C0",borderColor:"#000000",shadow:false}},dataLabels:{y:null,verticalAlign:null}});xb.bar=va(xb.column,{dataLabels:{align:"left",x:5,y:0}});xb.pie=va(la,{borderColor:"#FFFFFF",borderWidth:1,center:["50%","50%"],colorByPoint:true,dataLabels:{distance:30,enabled:true,formatter:function(){return this.point.name},y:5},legendType:"point",marker:null,
-size:"75%",showInLegend:false,slicedOffset:10,states:{hover:{brightness:0.1,shadow:false}}});Bd();var Yb=function(a){var b=[],c;(function(d){if(c=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/.exec(d))b=[ja(c[1]),ja(c[2]),ja(c[3]),parseFloat(c[4],10)];else if(c=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(d))b=[ja(c[1],16),ja(c[2],16),ja(c[3],16),1]})(a);return{get:function(d){return b&&!isNaN(b[0])?d==="rgb"?"rgb("+b[0]+","+b[1]+","+b[2]+
-")":d==="a"?b[3]:"rgba("+b.join(",")+")":a},brighten:function(d){if(dc(d)&&d!==0){var e;for(e=0;e<3;e++){b[e]+=ja(d*255);if(b[e]<0)b[e]=0;if(b[e]>255)b[e]=255}}return this},setOpacity:function(d){b[3]=d;return this}}};Ic.prototype={init:function(a,b){this.element=wa.createElementNS("http://www.w3.org/2000/svg",b);this.renderer=a},animate:function(a,b,c){if(b=C(b,Cc,true)){b=va(b);if(c)b.complete=c;Zc(this,a,b)}else{this.attr(a);c&&c()}},attr:function(a,b){var c,d,e,f,g=this.element,h=g.nodeName,j=
-this.renderer,l,n=this.shadows,J,D=this;if(Pb(a)&&M(b)){c=a;a={};a[c]=b}if(Pb(a)){c=a;if(h==="circle")c={x:"cx",y:"cy"}[c]||c;else if(c==="strokeWidth")c="stroke-width";D=Ea(g,c)||this[c]||0;if(c!=="d"&&c!=="visibility")D=parseFloat(D)}else for(c in a){l=false;d=a[c];if(c==="d"){if(d&&d.join)d=d.join(" ");if(/(NaN| {2}|^$)/.test(d))d="M 0 0";this.d=d}else if(c==="x"&&h==="text"){for(e=0;e<g.childNodes.length;e++){f=g.childNodes[e];Ea(f,"x")===Ea(g,"x")&&Ea(f,"x",d)}if(this.rotation)Ea(g,"transform",
-"rotate("+this.rotation+" "+d+" "+ja(a.y||Ea(g,"y"))+")")}else if(c==="fill")d=j.color(d,g,c);else if(h==="circle"&&(c==="x"||c==="y"))c={x:"cx",y:"cy"}[c]||c;else if(c==="translateX"||c==="translateY"||c==="rotation"||c==="verticalAlign"){this[c]=d;this.updateTransform();l=true}else if(c==="stroke")d=j.color(d,g,c);else if(c==="dashstyle"){c="stroke-dasharray";d=d&&d.toLowerCase();if(d==="solid")d=jb;else if(d){d=d.replace("shortdashdotdot","3,1,1,1,1,1,").replace("shortdashdot","3,1,1,1").replace("shortdot",
-"1,1,").replace("shortdash","3,1,").replace("longdash","8,3,").replace(/dot/g,"1,3,").replace("dash","4,3,").replace(/,$/,"").split(",");for(e=d.length;e--;)d[e]=ja(d[e])*a["stroke-width"];d=d.join(",")}}else if(c==="isTracker")this[c]=d;else if(c==="width")d=ja(d);else if(c==="align"){c="text-anchor";d={left:"start",center:"middle",right:"end"}[d]}if(c==="strokeWidth")c="stroke-width";if(Nd&&c==="stroke-width"&&d===0)d=1.0E-6;if(this.symbolName&&/^(x|y|r|start|end|innerR)/.test(c)){if(!J){this.symbolAttr(a);
-J=true}l=true}if(n&&/^(width|height|visibility|x|y|d)$/.test(c))for(e=n.length;e--;)Ea(n[e],c,d);if((c==="width"||c==="height")&&h==="rect"&&d<0)d=0;if(c==="text"){this.textStr=d;this.added&&j.buildText(this)}else l||Ea(g,c,d)}return D},symbolAttr:function(a){var b=this;u(["x","y","r","start","end","width","height","innerR"],function(c){b[c]=C(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](X(b.x*2)/2,X(b.y*2)/2,b.r,{start:b.start,end:b.end,width:b.width,height:b.height,innerR:b.innerR})})},
-clip:function(a){return this.attr("clip-path","url("+this.renderer.url+"#"+a.id+")")},crisp:function(a,b,c,d,e){var f,g={},h={},j;a=a||this.strokeWidth||0;j=a%2/2;h.x=kb(b||this.x||0)+j;h.y=kb(c||this.y||0)+j;h.width=kb((d||this.width||0)-2*j);h.height=kb((e||this.height||0)-2*j);h.strokeWidth=a;for(f in h)if(this[f]!==h[f])this[f]=g[f]=h[f];return g},css:function(a){var b=this.element;b=a&&a.width&&b.nodeName==="text";var c,d="",e=function(f,g){return"-"+g.toLowerCase()};if(a&&a.color)a.fill=a.color;
-this.styles=a=pa(this.styles,a);if(Bc&&!yc){b&&delete a.width;Na(this.element,a)}else{for(c in a)d+=c.replace(/([A-Z])/g,e)+":"+a[c]+";";this.attr({style:d})}b&&this.added&&this.renderer.buildText(this);return this},on:function(a,b){var c=b;if(Jb&&a==="click"){a="touchstart";c=function(d){d.preventDefault();b()}}this.element["on"+a]=c;return this},translate:function(a,b){return this.attr({translateX:a,translateY:b})},invert:function(){this.inverted=true;this.updateTransform();return this},updateTransform:function(){var a=
-this.translateX||0,b=this.translateY||0,c=this.inverted,d=this.rotation,e=[];if(c){a+=this.attr("width");b+=this.attr("height")}if(a||b)e.push("translate("+a+","+b+")");if(c)e.push("rotate(90) scale(-1,1)");else d&&e.push("rotate("+d+" "+this.x+" "+this.y+")");e.length&&Ea(this.element,"transform",e.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){if(a){this.alignOptions=a;this.alignByTranslate=b;c||this.renderer.alignedObjects.push(this)}else{a=
-this.alignOptions;b=this.alignByTranslate}c=C(c,this.renderer);var d=a.align,e=a.verticalAlign,f=(c.x||0)+(a.x||0),g=(c.y||0)+(a.y||0),h={};if(/^(right|center)$/.test(d))f+=(c.width-(a.width||0))/{right:1,center:2}[d];h[b?"translateX":"x"]=X(f);if(/^(bottom|middle)$/.test(e))g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=X(g);this[this.placed?"animate":"attr"](h);this.placed=true;this.alignAttr=h;return this},getBBox:function(){var a,b,c,d=this.rotation,e=d*Ud;try{a=
-pa({},this.element.getBBox())}catch(f){a={width:0,height:0}}b=a.width;c=a.height;if(d){a.width=$a(c*Db(e))+$a(b*nb(e));a.height=$a(c*nb(e))+$a(b*Db(e))}return a},show:function(){return this.attr({visibility:Ab})},hide:function(){return this.attr({visibility:ub})},add:function(a){var b=this.renderer,c=a||b,d=c.element||b.box,e=d.childNodes,f=this.element,g=Ea(f,"zIndex");this.parentInverted=a&&a.inverted;this.textStr!==undefined&&b.buildText(this);if(g){c.handleZ=true;g=ja(g)}if(c.handleZ)for(c=0;c<
-e.length;c++){a=e[c];b=Ea(a,"zIndex");if(a!==f&&(ja(b)>g||!M(g)&&M(b))){d.insertBefore(f,a);return this}}d.appendChild(f);this.added=true;return this},destroy:function(){var a=this.element||{},b=this.shadows,c=a.parentNode,d;a.onclick=a.onmouseout=a.onmouseover=a.onmousemove=null;Tc(this);c&&c.removeChild(a);b&&u(b,function(e){(c=e.parentNode)&&c.removeChild(e)});qc(this.renderer.alignedObjects,this);for(d in this)delete this[d];return null},empty:function(){for(var a=this.element,b=a.childNodes,
-c=b.length;c--;)a.removeChild(b[c])},shadow:function(a,b){var c=[],d,e,f=this.element,g=this.parentInverted?"(-1,-1)":"(1,1)";if(a){for(d=1;d<=3;d++){e=f.cloneNode(0);Ea(e,{isShadow:"true",stroke:"rgb(0, 0, 0)","stroke-opacity":0.05*d,"stroke-width":7-2*d,transform:"translate"+g,fill:jb});b?b.element.appendChild(e):f.parentNode.insertBefore(e,f);c.push(e)}this.shadows=c}return this}};var Vc=function(){this.init.apply(this,arguments)};Vc.prototype={Element:Ic,init:function(a,b,c,d){var e=location,
-f;f=this.createElement("svg").attr({xmlns:"http://www.w3.org/2000/svg",version:"1.1"});a.appendChild(f.element);this.box=f.element;this.boxWrapper=f;this.alignedObjects=[];this.url=Bc?"":e.href.replace(/#.*?$/,"");this.defs=this.createElement("defs").add();this.forExport=d;this.setSize(b,c,false)},createElement:function(a){var b=new this.Element;b.init(this,a);return b},buildText:function(a){for(var b=a.element,c=C(a.textStr,"").toString().replace(/<(b|strong)>/g,'<span style="font-weight:bold">').replace(/<(i|em)>/g,
-'<span style="font-style:italic">').replace(/<a/g,"<span").replace(/<\/(b|strong|i|em|a)>/g,"</span>").split(/<br.*?>/g),d=b.childNodes,e=/style="([^"]+)"/,f=/href="([^"]+)"/,g=Ea(b,"x"),h=a.styles,j=Rd&&h&&h.HcDirection==="rtl"&&!this.forExport&&ja(pc.split("Firefox/")[1])<4,l,n=h&&ja(h.width),J=h&&h.lineHeight,D,aa=d.length;aa--;)b.removeChild(d[aa]);n&&!a.added&&this.box.appendChild(b);u(c,function(E,da){var w,R=0,B;E=E.replace(/<span/g,"|||<span").replace(/<\/span>/g,"</span>|||");w=E.split("|||");
-u(w,function(K){if(K!==""||w.length===1){var S={},I=wa.createElementNS("http://www.w3.org/2000/svg","tspan");e.test(K)&&Ea(I,"style",K.match(e)[1].replace(/(;| |^)color([ :])/,"$1fill$2"));if(f.test(K)){Ea(I,"onclick",'location.href="'+K.match(f)[1]+'"');Na(I,{cursor:"pointer"})}K=(K.replace(/<(.|\n)*?>/g,"")||" ").replace(/&lt;/g,"<").replace(/&gt;/g,">");if(j){l=[];for(aa=K.length;aa--;)l.push(K.charAt(aa));K=l.join("")}I.appendChild(wa.createTextNode(K));if(R)S.dx=3;else S.x=g;if(!R){if(da){!yc&&
-a.renderer.forExport&&Na(I,{display:"block"});B=cb.getComputedStyle&&ja(cb.getComputedStyle(D,null).getPropertyValue("line-height"));if(!B||isNaN(B))B=J||D.offsetHeight||18;Ea(I,"dy",B)}D=I}Ea(I,S);b.appendChild(I);R++;if(n){K=K.replace(/-/g,"- ").split(" ");for(var za,Da=[];K.length||Da.length;){za=b.getBBox().width;S=za>n;if(!S||K.length===1){K=Da;Da=[];if(K.length){I=wa.createElementNS("http://www.w3.org/2000/svg","tspan");Ea(I,{dy:J||16,x:g});b.appendChild(I);if(za>n)n=za}}else{I.removeChild(I.firstChild);
-Da.unshift(K.pop())}K.length&&I.appendChild(wa.createTextNode(K.join(" ").replace(/- /g,"-")))}}}})})},crispLine:function(a,b){if(a[1]===a[4])a[1]=a[4]=X(a[1])+b%2/2;if(a[2]===a[5])a[2]=a[5]=X(a[2])+b%2/2;return a},path:function(a){return this.createElement("path").attr({d:a,fill:jb})},circle:function(a,b,c){a=Lb(a)?a:{x:a,y:b,r:c};return this.createElement("circle").attr(a)},arc:function(a,b,c,d,e,f){if(Lb(a)){b=a.y;c=a.r;d=a.innerR;e=a.start;f=a.end;a=a.x}return this.symbol("arc",a||0,b||0,c||0,
-{innerR:d||0,start:e||0,end:f||0})},rect:function(a,b,c,d,e,f){if(Lb(a)){b=a.y;c=a.width;d=a.height;e=a.r;f=a.strokeWidth;a=a.x}e=this.createElement("rect").attr({rx:e,ry:e,fill:jb});return e.attr(e.crisp(f,a,b,Ha(c,0),Ha(d,0)))},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[C(c,true)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){return this.createElement("g").attr(M(a)&&{"class":nc+a})},image:function(a,b,c,d,
-e){var f={preserveAspectRatio:jb};arguments.length>1&&pa(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e){var f,g=this.symbols[a];g=g&&g(X(b),X(c),d,e);var h=/^url\((.*?)\)$/,j;if(g){f=this.path(g);pa(f,{symbolName:a,x:b,y:c,r:d});e&&pa(f,e)}else if(h.test(a)){var l=function(n,J){n.attr({width:J[0],height:J[1]}).translate(-X(J[0]/
-2),-X(J[1]/2))};j=a.match(h)[1];a=Vd[j];f=this.image(j).attr({x:b,y:c});if(a)l(f,a);else{f.attr({width:0,height:0});ib("img",{onload:function(){l(f,Vd[j]=[this.width,this.height])},src:j})}}else f=this.circle(b,c,d);return f},symbols:{square:function(a,b,c){c=0.707*c;return[ab,a-c,b-c,La,a+c,b-c,a+c,b+c,a-c,b+c,"Z"]},triangle:function(a,b,c){return[ab,a,b-1.33*c,La,a+c,b+0.67*c,a-c,b+0.67*c,"Z"]},"triangle-down":function(a,b,c){return[ab,a,b+1.33*c,La,a-c,b-0.67*c,a+c,b-0.67*c,"Z"]},diamond:function(a,
-b,c){return[ab,a,b-c,La,a+c,b,a,b+c,a-c,b,"Z"]},arc:function(a,b,c,d){var e=d.start,f=d.end-1.0E-6,g=d.innerR,h=nb(e),j=Db(e),l=nb(f);f=Db(f);d=d.end-e<cc?0:1;return[ab,a+c*h,b+c*j,"A",c,c,0,d,1,a+c*l,b+c*f,La,a+g*l,b+g*f,"A",g,g,0,d,0,a+g*h,b+g*j,"Z"]}},clipRect:function(a,b,c,d){var e=nc+qd++,f=this.createElement("clipPath").attr({id:e}).add(this.defs);a=this.rect(a,b,c,d,0).add(f);a.id=e;return a},color:function(a,b,c){var d,e=/^rgba/;if(a&&a.linearGradient){var f=this;b=a.linearGradient;c=nc+
-qd++;var g,h,j;g=f.createElement("linearGradient").attr({id:c,gradientUnits:"userSpaceOnUse",x1:b[0],y1:b[1],x2:b[2],y2:b[3]}).add(f.defs);u(a.stops,function(l){if(e.test(l[1])){d=Yb(l[1]);h=d.get("rgb");j=d.get("a")}else{h=l[1];j=1}f.createElement("stop").attr({offset:l[0],"stop-color":h,"stop-opacity":j}).add(g)});return"url("+this.url+"#"+c+")"}else if(e.test(a)){d=Yb(a);Ea(b,c+"-opacity",d.get("a"));return d.get("rgb")}else return a},text:function(a,b,c){var d=Wa.chart.style;b=X(C(b,0));c=X(C(c,
-0));a=this.createElement("text").attr({x:b,y:c,text:a}).css({fontFamily:d.fontFamily,fontSize:d.fontSize});a.x=b;a.y=c;return a}};Wc=Vc;if(!yc){Eb=yb(Ic,{init:function(a,b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ",oc,";"];if(b==="shape"||b===Qb)d.push("left:0;top:0;width:10px;height:10px;");if(zc)d.push("visibility: ",b===Qb?ub:Ab);c.push(' style="',d.join(""),'"/>');if(b){c=b===Qb||b==="span"||b==="img"?c.join(""):a.prepVML(c);this.element=ib(c)}this.renderer=a},add:function(a){var b=
-this.renderer,c=this.element,d=b.box;d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);zc&&d.gVis===ub&&Na(c,{visibility:ub});d.appendChild(c);this.added=true;this.alignOnAdd&&this.updateTransform();return this},attr:function(a,b){var c,d,e,f=this.element||{},g=f.style,h=f.nodeName,j=this.renderer,l=this.symbolName,n,J,D=this.shadows,aa=this;if(Pb(a)&&M(b)){c=a;a={};a[c]=b}if(Pb(a)){c=a;aa=c==="strokeWidth"||c==="stroke-width"?this.strokeweight:this[c]}else for(c in a){d=a[c];n=false;if(l&&/^(x|y|r|start|end|width|height|innerR)/.test(c)){if(!J){this.symbolAttr(a);
-J=true}n=true}else if(c==="d"){d=d||[];this.d=d.join(" ");e=d.length;for(n=[];e--;)n[e]=dc(d[e])?X(d[e]*10)-5:d[e]==="Z"?"x":d[e];d=n.join(" ")||"x";f.path=d;if(D)for(e=D.length;e--;)D[e].path=d;n=true}else if(c==="zIndex"||c==="visibility"){if(zc&&c==="visibility"&&h==="DIV"){f.gVis=d;n=f.childNodes;for(e=n.length;e--;)Na(n[e],{visibility:d});if(d===Ab)d=null}if(d)g[c]=d;n=true}else if(/^(width|height)$/.test(c)){if(this.updateClipping){this[c]=d;this.updateClipping()}else g[c]=d;n=true}else if(/^(x|y)$/.test(c)){this[c]=
-d;if(f.tagName==="SPAN")this.updateTransform();else g[{x:"left",y:"top"}[c]]=d}else if(c==="class")f.className=d;else if(c==="stroke"){d=j.color(d,f,c);c="strokecolor"}else if(c==="stroke-width"||c==="strokeWidth"){f.stroked=d?true:false;c="strokeweight";this[c]=d;if(dc(d))d+=bb}else if(c==="dashstyle"){(f.getElementsByTagName("stroke")[0]||ib(j.prepVML(["<stroke/>"]),null,null,f))[c]=d||"solid";this.dashstyle=d;n=true}else if(c==="fill")if(h==="SPAN")g.color=d;else{f.filled=d!==jb?true:false;d=j.color(d,
-f,c);c="fillcolor"}else if(c==="translateX"||c==="translateY"||c==="rotation"||c==="align"){if(c==="align")c="textAlign";this[c]=d;this.updateTransform();n=true}else if(c==="text"){this.bBox=null;f.innerHTML=d;n=true}if(D&&c==="visibility")for(e=D.length;e--;)D[e].style[c]=d;if(!n)if(zc)f[c]=d;else Ea(f,c,d)}return aa},clip:function(a){var b=this,c=a.members;c.push(b);b.destroyClip=function(){qc(c,b)};return b.css(a.getCSS(b.inverted))},css:function(a){var b=this.element;if(b=a&&b.tagName==="SPAN"&&
-a.width){delete a.width;this.textWidth=b;this.updateTransform()}this.styles=pa(this.styles,a);Na(this.element,a);return this},destroy:function(){this.destroyClip&&this.destroyClip();Ic.prototype.destroy.apply(this)},empty:function(){for(var a=this.element.childNodes,b=a.length,c;b--;){c=a[b];c.parentNode.removeChild(c)}},getBBox:function(){var a=this.element,b=this.bBox;if(!b){if(a.nodeName==="text")a.style.position=oc;b=this.bBox={x:a.offsetLeft,y:a.offsetTop,width:a.offsetWidth,height:a.offsetHeight}}return b},
-on:function(a,b){this.element["on"+a]=function(){var c=cb.event;c.target=c.srcElement;b(c)};return this},updateTransform:function(){if(this.added){var a=this,b=a.element,c=a.translateX||0,d=a.translateY||0,e=a.x||0,f=a.y||0,g=a.textAlign||"left",h={left:0,center:0.5,right:1}[g],j=g&&g!=="left";if(c||d)a.css({marginLeft:c,marginTop:d});a.inverted&&u(b.childNodes,function(R){a.renderer.invertChild(R,b)});if(b.tagName==="SPAN"){var l,n;c=a.rotation;var J;l=0;d=1;var D=0,aa;J=ja(a.textWidth);var E=a.xCorr||
-0,da=a.yCorr||0,w=[c,g,b.innerHTML,a.textWidth].join(",");if(w!==a.cTT){if(M(c)){l=c*Ud;d=nb(l);D=Db(l);Na(b,{filter:c?["progid:DXImageTransform.Microsoft.Matrix(M11=",d,", M12=",-D,", M21=",D,", M22=",d,", sizingMethod='auto expand')"].join(""):jb})}l=b.offsetWidth;n=b.offsetHeight;if(l>J){Na(b,{width:J+bb,display:"block",whiteSpace:"normal"});l=J}J=X((ja(b.style.fontSize)||12)*1.2);E=d<0&&-l;da=D<0&&-n;aa=d*D<0;E+=D*J*(aa?1-h:h);da-=d*J*(c?aa?h:1-h:1);if(j){E-=l*h*(d<0?-1:1);if(c)da-=n*h*(D<0?-1:
-1);Na(b,{textAlign:g})}a.xCorr=E;a.yCorr=da}Na(b,{left:e+E,top:f+da});a.cTT=w}}else this.alignOnAdd=true},shadow:function(a,b){var c=[],d,e=this.element,f=this.renderer,g,h=e.style,j,l=e.path;if(l&&typeof l.value!=="string")l="x";if(a){for(d=1;d<=3;d++){j=['<shape isShadow="true" strokeweight="',7-2*d,'" filled="false" path="',l,'" coordsize="100,100" style="',e.style.cssText,'" />'];g=ib(f.prepVML(j),null,{left:ja(h.left)+1,top:ja(h.top)+1});j=['<stroke color="black" opacity="',0.05*d,'"/>'];ib(f.prepVML(j),
-null,null,g);b?b.element.appendChild(g):e.parentNode.insertBefore(g,e);c.push(g)}this.shadows=c}return this}});la=function(){this.init.apply(this,arguments)};la.prototype=va(Vc.prototype,{Element:Eb,isIE8:pc.indexOf("MSIE 8.0")>-1,init:function(a,b,c){var d;this.alignedObjects=[];d=this.createElement(Qb);a.appendChild(d.element);this.box=d.element;this.boxWrapper=d;this.setSize(b,c,false);if(!wa.namespaces.hcv){wa.namespaces.add("hcv","urn:schemas-microsoft-com:vml");wa.createStyleSheet().cssText=
-"hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}},clipRect:function(a,b,c,d){var e=this.createElement();return pa(e,{members:[],left:a,top:b,width:c,height:d,getCSS:function(f){var g=this.top,h=this.left,j=h+this.width,l=g+this.height;g={clip:"rect("+X(f?h:g)+"px,"+X(f?l:j)+"px,"+X(f?j:l)+"px,"+X(f?g:h)+"px)"};!f&&zc&&pa(g,{width:j+bb,height:l+bb});return g},updateClipping:function(){u(e.members,function(f){f.css(e.getCSS(f.inverted))})}})},
-color:function(a,b,c){var d,e=/^rgba/;if(a&&a.linearGradient){var f,g,h=a.linearGradient,j,l,n,J;u(a.stops,function(D,aa){if(e.test(D[1])){d=Yb(D[1]);f=d.get("rgb");g=d.get("a")}else{f=D[1];g=1}if(aa){n=f;J=g}else{j=f;l=g}});a=90-sa.atan((h[3]-h[1])/(h[2]-h[0]))*180/cc;c=["<",c,' colors="0% ',j,",100% ",n,'" angle="',a,'" opacity="',J,'" o:opacity2="',l,'" type="gradient" focus="100%" />'];ib(this.prepVML(c),null,null,b)}else if(e.test(a)&&b.tagName!=="IMG"){d=Yb(a);c=["<",c,' opacity="',d.get("a"),
-'"/>'];ib(this.prepVML(c),null,null,b);return d.get("rgb")}else return a},prepVML:function(a){var b=this.isIE8;a=a.join("");if(b){a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />');a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'):a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')}else a=a.replace("<","<hcv:");return a},text:function(a,b,c){var d=Wa.chart.style;return this.createElement("span").attr({text:a,
-x:X(b),y:X(c)}).css({whiteSpace:"nowrap",fontFamily:d.fontFamily,fontSize:d.fontSize})},path:function(a){return this.createElement("shape").attr({coordsize:"100 100",d:a})},circle:function(a,b,c){return this.symbol("circle").attr({x:a,y:b,r:c})},g:function(a){var b;if(a)b={className:nc+a,"class":nc+a};return this.createElement(Qb).attr(b)},image:function(a,b,c,d,e){var f=this.createElement("img").attr({src:a});arguments.length>1&&f.css({left:b,top:c,width:d,height:e});return f},rect:function(a,b,
-c,d,e,f){if(Lb(a)){b=a.y;c=a.width;d=a.height;e=a.r;f=a.strokeWidth;a=a.x}var g=this.symbol("rect");g.r=e;return g.attr(g.crisp(f,a,b,Ha(c,0),Ha(d,0)))},invertChild:function(a,b){var c=b.style;Na(a,{flip:"x",left:ja(c.width)-10,top:ja(c.height)-10,rotation:-90})},symbols:{arc:function(a,b,c,d){var e=d.start,f=d.end,g=nb(e),h=Db(e),j=nb(f),l=Db(f);d=d.innerR;var n=0.07/c,J=d&&0.1/d||0;if(f-e===0)return["x"];else if(2*cc-f+e<n)j=-n;else if(f-e<J)j=nb(e+J);return["wa",a-c,b-c,a+c,b+c,a+c*g,b+c*h,a+c*
-j,b+c*l,"at",a-d,b-d,a+d,b+d,a+d*j,b+d*l,a+d*g,b+d*h,"x","e"]},circle:function(a,b,c){return["wa",a-c,b-c,a+c,b+c,a+c,b,a+c,b,"e"]},rect:function(a,b,c,d){if(!M(d))return[];var e=d.width;d=d.height;var f=a+e,g=b+d;c=qb(c,e,d);return[ab,a+c,b,La,f-c,b,"wa",f-2*c,b,f,b+2*c,f-c,b,f,b+c,La,f,g-c,"wa",f-2*c,g-2*c,f,g,f,g-c,f-c,g,La,a+c,g,"wa",a,g-2*c,a+2*c,g,a+c,g,a,g-c,La,a,b+c,"wa",a,b,a+2*c,b+2*c,a,b+c,a+c,b,"x","e"]}}});Wc=la}Gd.prototype.callbacks=[];var Ac=function(){};Ac.prototype={init:function(a,
-b){var c=a.chart.counters,d;this.series=a;this.applyOptions(b);this.pointAttr={};if(a.options.colorByPoint){d=a.chart.options.colors;if(!this.options)this.options={};this.color=this.options.color=this.color||d[c.color++];c.wrapColor(d.length)}a.chart.pointCount++;return this},applyOptions:function(a){var b=this.series;this.config=a;if(dc(a)||a===null)this.y=a;else if(Lb(a)&&!dc(a.length)){pa(this,a);this.options=a}else if(Pb(a[0])){this.name=a[0];this.y=a[1]}else if(dc(a[0])){this.x=a[0];this.y=a[1]}if(this.x===
-Va)this.x=b.autoIncrement()},destroy:function(){var a=this,b=a.series,c;b.chart.pointCount--;a===b.chart.hoverPoint&&a.onMouseOut();b.chart.hoverPoints=null;Cb(a);u(["graphic","tracker","group","dataLabel","connector"],function(d){a[d]&&a[d].destroy()});a.legendItem&&a.series.chart.legend.destroyItem(a);for(c in a)a[c]=null},getLabelConfig:function(){return{x:this.category,y:this.y,series:this.series,point:this,percentage:this.percentage,total:this.total||this.stackTotal}},select:function(a,b){var c=
-this,d=c.series.chart;c.selected=a=C(a,!c.selected);c.firePointEvent(a?"select":"unselect");c.setState(a&&"select");b||u(d.getSelectedPoints(),function(e){if(e.selected&&e!==c){e.selected=false;e.setState(hb);e.firePointEvent("unselect")}})},onMouseOver:function(){var a=this.series.chart,b=a.tooltip,c=a.hoverPoint;c&&c!==this&&c.onMouseOut();this.firePointEvent("mouseOver");b&&!b.shared&&b.refresh(this);this.setState(Bb);a.hoverPoint=this},onMouseOut:function(){this.firePointEvent("mouseOut");this.setState();
-this.series.chart.hoverPoint=null},tooltipFormatter:function(a){var b=this.series;return['<span style="color:'+b.color+'">',this.name||b.name,"</span>: ",!a?"<b>x = "+(this.name||this.x)+",</b> ":"","<b>",!a?"y = ":"",this.y,"</b>"].join("")},update:function(a,b,c){var d=this,e=d.series,f=d.graphic,g=e.chart;b=C(b,true);d.firePointEvent("update",{options:a},function(){d.applyOptions(a);if(Lb(a)){e.getAttribs();f&&f.attr(d.pointAttr[e.state])}e.isDirty=true;b&&g.redraw(c)})},remove:function(a,b){var c=
-this,d=c.series,e=d.chart,f=d.data;ec(b,e);a=C(a,true);c.firePointEvent("remove",null,function(){qc(f,c);c.destroy();d.isDirty=true;a&&e.redraw()})},firePointEvent:function(a,b,c){var d=this,e=this.series.options;if(e.point.events[a]||d.options&&d.options.events&&d.options.events[a])this.importEvents();if(a==="click"&&e.allowPointSelect)c=function(f){d.select(null,f.ctrlKey||f.metaKey||f.shiftKey)};Pa(this,a,b,c)},importEvents:function(){if(!this.hasImportedEvents){var a=va(this.series.options.point,
-this.options).events,b;this.events=a;for(b in a)Sa(this,b,a[b]);this.hasImportedEvents=true}},setState:function(a){var b=this.series,c=b.options.states,d=xb[b.type].marker&&b.options.marker,e=d&&!d.enabled,f=(d=d&&d.states[a])&&d.enabled===false,g=b.stateMarkerGraphic,h=b.chart,j=this.pointAttr;a=a||hb;if(!(a===this.state||this.selected&&a!=="select"||c[a]&&c[a].enabled===false||a&&(f||e&&!d.enabled))){if(this.graphic)this.graphic.attr(j[a]);else{if(a){if(!g)b.stateMarkerGraphic=g=h.renderer.circle(0,
-0,j[a].r).attr(j[a]).add(b.group);g.translate(this.plotX,this.plotY)}if(g)g[a?"show":"hide"]()}this.state=a}}};var pb=function(){};pb.prototype={isCartesian:true,type:"line",pointClass:Ac,pointAttrToOptions:{stroke:"lineColor","stroke-width":"lineWidth",fill:"fillColor",r:"radius"},init:function(a,b){var c,d;d=a.series.length;this.chart=a;b=this.setOptions(b);pa(this,{index:d,options:b,name:b.name||"Series "+(d+1),state:hb,pointAttr:{},visible:b.visible!==false,selected:b.selected===true});d=b.events;
-for(c in d)Sa(this,c,d[c]);if(d&&d.click||b.point&&b.point.events&&b.point.events.click||b.allowPointSelect)a.runTrackerClick=true;this.getColor();this.getSymbol();this.setData(b.data,false)},autoIncrement:function(){var a=this.options,b=this.xIncrement;b=C(b,a.pointStart,0);this.pointInterval=C(this.pointInterval,a.pointInterval,1);this.xIncrement=b+this.pointInterval;return b},cleanData:function(){var a=this.chart,b=this.data,c,d,e=a.smallestInterval,f,g;b.sort(function(h,j){return h.x-j.x});if(this.options.connectNulls)for(g=
-b.length-1;g>=0;g--)b[g].y===null&&b[g-1]&&b[g+1]&&b.splice(g,1);for(g=b.length-1;g>=0;g--)if(b[g-1]){f=b[g].x-b[g-1].x;if(f>0&&(d===Va||f<d)){d=f;c=g}}if(e===Va||d<e)a.smallestInterval=d;this.closestPoints=c},getSegments:function(){var a=-1,b=[],c=this.data;u(c,function(d,e){if(d.y===null){e>a+1&&b.push(c.slice(a+1,e));a=e}else e===c.length-1&&b.push(c.slice(a+1,e+1))});this.segments=b},setOptions:function(a){var b=this.chart.options.plotOptions;return va(b[this.type],b.series,a)},getColor:function(){var a=
-this.chart.options.colors,b=this.chart.counters;this.color=this.options.color||a[b.color++]||"#0000ff";b.wrapColor(a.length)},getSymbol:function(){var a=this.chart.options.symbols,b=this.chart.counters;this.symbol=this.options.marker.symbol||a[b.symbol++];b.wrapSymbol(a.length)},addPoint:function(a,b,c,d){var e=this.data,f=this.graph,g=this.area,h=this.chart;a=(new this.pointClass).init(this,a);ec(d,h);if(f&&c)f.shift=c;if(g){g.shift=c;g.isArea=true}b=C(b,true);e.push(a);c&&e[0].remove(false);this.getAttribs();
-this.isDirty=true;b&&h.redraw()},setData:function(a,b){var c=this,d=c.data,e=c.initialColor,f=c.chart,g=d&&d.length||0;c.xIncrement=null;if(M(e))f.counters.color=e;for(a=mc(rc(a||[]),function(h){return(new c.pointClass).init(c,h)});g--;)d[g].destroy();c.data=a;c.cleanData();c.getSegments();c.getAttribs();c.isDirty=true;f.isDirtyBox=true;C(b,true)&&f.redraw(false)},remove:function(a,b){var c=this,d=c.chart;a=C(a,true);if(!c.isRemoving){c.isRemoving=true;Pa(c,"remove",null,function(){c.destroy();d.isDirtyLegend=
-d.isDirtyBox=true;a&&d.redraw(b)})}c.isRemoving=false},translate:function(){for(var a=this.chart,b=this.options.stacking,c=this.xAxis.categories,d=this.yAxis,e=this.data,f=e.length;f--;){var g=e[f],h=g.x,j=g.y,l=g.low,n=d.stacks[(j<0?"-":"")+this.stackKey];g.plotX=this.xAxis.translate(h);if(b&&this.visible&&n&&n[h]){l=n[h];h=l.total;l.cum=l=l.cum-j;j=l+j;if(b==="percent"){l=h?l*100/h:0;j=h?j*100/h:0}g.percentage=h?g.y*100/h:0;g.stackTotal=h}if(M(l))g.yBottom=d.translate(l,0,1,0,1);if(j!==null)g.plotY=
-d.translate(j,0,1,0,1);g.clientX=a.inverted?a.plotHeight-g.plotX:g.plotX;g.category=c&&c[g.x]!==Va?c[g.x]:g.x}},setTooltipPoints:function(a){var b=this.chart,c=b.inverted,d=[],e=X((c?b.plotTop:b.plotLeft)+b.plotSizeX),f,g,h=[];if(a)this.tooltipPoints=null;u(this.segments,function(j){d=d.concat(j)});if(this.xAxis&&this.xAxis.reversed)d=d.reverse();u(d,function(j,l){f=d[l-1]?d[l-1]._high+1:0;for(g=j._high=d[l+1]?kb((j.plotX+(d[l+1]?d[l+1].plotX:e))/2):e;f<=g;)h[c?e-f++:f++]=j});this.tooltipPoints=h},
-onMouseOver:function(){var a=this.chart,b=a.hoverSeries;if(!(!Jb&&a.mouseIsDown)){b&&b!==this&&b.onMouseOut();this.options.events.mouseOver&&Pa(this,"mouseOver");this.tracker&&this.tracker.toFront();this.setState(Bb);a.hoverSeries=this}},onMouseOut:function(){var a=this.options,b=this.chart,c=b.tooltip,d=b.hoverPoint;d&&d.onMouseOut();this&&a.events.mouseOut&&Pa(this,"mouseOut");c&&!a.stickyTracking&&c.hide();this.setState();b.hoverSeries=null},animate:function(a){var b=this.chart,c=this.clipRect,
-d=this.options.animation;if(d&&!Lb(d))d={};if(a){if(!c.isAnimating){c.attr("width",0);c.isAnimating=true}}else{c.animate({width:b.plotSizeX},d);this.animate=null}},drawPoints:function(){var a,b=this.data,c=this.chart,d,e,f,g,h,j;if(this.options.marker.enabled)for(f=b.length;f--;){g=b[f];d=g.plotX;e=g.plotY;j=g.graphic;if(e!==Va&&!isNaN(e)){a=g.pointAttr[g.selected?"select":hb];h=a.r;if(j)j.animate({x:d,y:e,r:h});else g.graphic=c.renderer.symbol(C(g.marker&&g.marker.symbol,this.symbol),d,e,h).attr(a).add(this.group)}}},
-convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={};a=a||{};b=b||{};c=c||{};d=d||{};for(f in e){g=e[f];h[f]=C(a[g],b[f],c[f],d[f])}return h},getAttribs:function(){var a=this,b=xb[a.type].marker?a.options.marker:a.options,c=b.states,d=c[Bb],e,f=a.color,g={stroke:f,fill:f},h=a.data,j=[],l,n=a.pointAttrToOptions,J;if(a.options.marker){d.radius=d.radius||b.radius+2;d.lineWidth=d.lineWidth||b.lineWidth+1}else d.color=d.color||Yb(d.color||f).brighten(d.brightness).get();j[hb]=a.convertAttribs(b,
-g);u([Bb,"select"],function(D){j[D]=a.convertAttribs(c[D],j[hb])});a.pointAttr=j;for(f=h.length;f--;){g=h[f];if((b=g.options&&g.options.marker||g.options)&&b.enabled===false)b.radius=0;e=false;if(g.options)for(J in n)if(M(b[n[J]]))e=true;if(e){l=[];c=b.states||{};e=c[Bb]=c[Bb]||{};if(!a.options.marker)e.color=Yb(e.color||g.options.color).brighten(e.brightness||d.brightness).get();l[hb]=a.convertAttribs(b,j[hb]);l[Bb]=a.convertAttribs(c[Bb],j[Bb],l[hb]);l.select=a.convertAttribs(c.select,j.select,
-l[hb])}else l=j;g.pointAttr=l}},destroy:function(){var a=this,b=a.chart,c=/\/5[0-9\.]+ (Safari|Mobile)\//.test(pc),d,e;Pa(a,"destroy");Cb(a);a.legendItem&&a.chart.legend.destroyItem(a);u(a.data,function(f){f.destroy()});u(["area","graph","dataLabelsGroup","group","tracker"],function(f){if(a[f]){d=c&&f==="group"?"hide":"destroy";a[f][d]()}});if(b.hoverSeries===a)b.hoverSeries=null;qc(b.series,a);for(e in a)delete a[e]},drawDataLabels:function(){if(this.options.dataLabels.enabled){var a=this,b,c,d=
-a.data,e=a.options.dataLabels,f,g=a.dataLabelsGroup,h=a.chart,j=h.inverted,l=a.type,n;n=a.options.stacking;var J=l==="column"||l==="bar",D=e.verticalAlign===null,aa=e.y===null;if(J)if(n){if(D)e=va(e,{verticalAlign:"middle"});if(aa)e=va(e,{y:{top:14,middle:4,bottom:-6}[e.verticalAlign]})}else if(D)e=va(e,{verticalAlign:"top"});if(!g)g=a.dataLabelsGroup=h.renderer.g("data-labels").attr({visibility:a.visible?Ab:ub,zIndex:6}).translate(h.plotLeft,h.plotTop).add();n=e.color;if(n==="auto")n=null;e.style.color=
-C(n,a.color);u(d,function(E){var da=E.barX,w=da&&da+E.barW/2||E.plotX||-999,R=C(E.plotY,-999),B=E.dataLabel,K=e.align,S=aa?E.y>0?-6:12:e.y;f=e.formatter.call(E.getLabelConfig());b=(j?h.plotWidth-R:w)+e.x;c=(j?h.plotHeight-w:R)+S;if(l==="column")b+={left:-1,right:1}[K]*E.barW/2||0;if(j&&E.y<0){K="right";b-=10}if(B){if(j&&!e.y)c=c+ja(B.styles.lineHeight)*0.9-B.getBBox().height/2;B.attr({text:f}).animate({x:b,y:c})}else if(M(f)){B=E.dataLabel=h.renderer.text(f,b,c).attr({align:K,rotation:e.rotation,
-zIndex:1}).css(e.style).add(g);j&&!e.y&&B.attr({y:c+ja(B.styles.lineHeight)*0.9-B.getBBox().height/2})}if(J&&a.options.stacking){w=E.barY;R=E.barW;E=E.barH;B.align(e,null,{x:j?h.plotWidth-w-E:da,y:j?h.plotHeight-da-R:w,width:j?E:R,height:j?R:E})}})}},drawGraph:function(){var a=this,b=a.options,c=a.graph,d=[],e,f=a.area,g=a.group,h=b.lineColor||a.color,j=b.lineWidth,l=b.dashStyle,n,J=a.chart.renderer,D=a.yAxis.getThreshold(b.threshold||0),aa=/^area/.test(a.type),E=[],da=[];u(a.segments,function(w){n=
-[];u(w,function(S,I){if(a.getPointSpline)n.push.apply(n,a.getPointSpline(w,S,I));else{n.push(I?La:ab);I&&b.step&&n.push(S.plotX,w[I-1].plotY);n.push(S.plotX,S.plotY)}});if(w.length>1)d=d.concat(n);else E.push(w[0]);if(aa){var R=[],B,K=n.length;for(B=0;B<K;B++)R.push(n[B]);K===3&&R.push(La,n[1],n[2]);if(b.stacking&&a.type!=="areaspline")for(B=w.length-1;B>=0;B--)R.push(w[B].plotX,w[B].yBottom);else R.push(La,w[w.length-1].plotX,D,La,w[0].plotX,D);da=da.concat(R)}});a.graphPath=d;a.singlePoints=E;if(aa){e=
-C(b.fillColor,Yb(a.color).setOpacity(b.fillOpacity||0.75).get());if(f)f.animate({d:da});else a.area=a.chart.renderer.path(da).attr({fill:e}).add(g)}if(c)c.animate({d:d});else if(j){c={stroke:h,"stroke-width":j};if(l)c.dashstyle=l;a.graph=J.path(d).attr(c).add(g).shadow(b.shadow)}},render:function(){var a=this,b=a.chart,c,d,e=a.options,f=e.animation,g=f&&a.animate;f=g?f&&f.duration||500:0;var h=a.clipRect,j=b.renderer;if(!h){h=a.clipRect=!b.hasRendered&&b.clipRect?b.clipRect:j.clipRect(0,0,b.plotSizeX,
-b.plotSizeY);if(!b.clipRect)b.clipRect=h}if(!a.group){c=a.group=j.g("series");if(b.inverted){d=function(){c.attr({width:b.plotWidth,height:b.plotHeight}).invert()};d();Sa(b,"resize",d);Sa(a,"destroy",function(){Cb(b,"resize",d)})}c.clip(a.clipRect).attr({visibility:a.visible?Ab:ub,zIndex:e.zIndex}).translate(b.plotLeft,b.plotTop).add(b.seriesGroup)}a.drawDataLabels();g&&a.animate(true);a.drawGraph&&a.drawGraph();a.drawPoints();a.options.enableMouseTracking!==false&&a.drawTracker();g&&a.animate();
-setTimeout(function(){h.isAnimating=false;if((c=a.group)&&h!==b.clipRect&&h.renderer){c.clip(a.clipRect=b.clipRect);h.destroy()}},f);a.isDirty=false},redraw:function(){var a=this.chart,b=this.group;if(b){a.inverted&&b.attr({width:a.plotWidth,height:a.plotHeight});b.animate({translateX:a.plotLeft,translateY:a.plotTop})}this.translate();this.setTooltipPoints(true);this.render()},setState:function(a){var b=this.options,c=this.graph,d=b.states;b=b.lineWidth;a=a||hb;if(this.state!==a){this.state=a;if(!(d[a]&&
-d[a].enabled===false)){if(a)b=d[a].lineWidth||b+1;if(c&&!c.dashstyle)c.attr({"stroke-width":b},a?0:500)}}},setVisible:function(a,b){var c=this.chart,d=this.legendItem,e=this.group,f=this.tracker,g=this.dataLabelsGroup,h,j=this.data,l=c.options.chart.ignoreHiddenSeries;h=this.visible;h=(this.visible=a=a===Va?!h:a)?"show":"hide";e&&e[h]();if(f)f[h]();else for(e=j.length;e--;){f=j[e];f.tracker&&f.tracker[h]()}g&&g[h]();d&&c.legend.colorizeItem(this,a);this.isDirty=true;this.options.stacking&&u(c.series,
-function(n){if(n.options.stacking&&n.visible)n.isDirty=true});if(l)c.isDirtyBox=true;b!==false&&c.redraw();Pa(this,h)},show:function(){this.setVisible(true)},hide:function(){this.setVisible(false)},select:function(a){this.selected=a=a===Va?!this.selected:a;if(this.checkbox)this.checkbox.checked=a;Pa(this,a?"select":"unselect")},drawTracker:function(){var a=this,b=a.options,c=[].concat(a.graphPath),d=c.length,e=a.chart,f=e.options.tooltip.snap,g=a.tracker,h=b.cursor;h=h&&{cursor:h};var j=a.singlePoints,
-l;if(d)for(l=d+1;l--;){c[l]===ab&&c.splice(l+1,0,c[l+1]-f,c[l+2],La);if(l&&c[l]===ab||l===d)c.splice(l,0,La,c[l-2]+f,c[l-1])}for(l=0;l<j.length;l++){d=j[l];c.push(ab,d.plotX-f,d.plotY,La,d.plotX+f,d.plotY)}if(g)g.attr({d:c});else a.tracker=e.renderer.path(c).attr({isTracker:true,stroke:Wd,fill:jb,"stroke-width":b.lineWidth+2*f,visibility:a.visible?Ab:ub,zIndex:1}).on(Jb?"touchstart":"mouseover",function(){e.hoverSeries!==a&&a.onMouseOver()}).on("mouseout",function(){b.stickyTracking||a.onMouseOut()}).css(h).add(e.trackerGroup)}};
-la=yb(pb);vb.line=la;la=yb(pb,{type:"area"});vb.area=la;la=yb(pb,{type:"spline",getPointSpline:function(a,b,c){var d=b.plotX,e=b.plotY,f=a[c-1],g=a[c+1],h,j,l,n;if(c&&c<a.length-1){a=f.plotY;l=g.plotX;g=g.plotY;var J;h=(1.5*d+f.plotX)/2.5;j=(1.5*e+a)/2.5;l=(1.5*d+l)/2.5;n=(1.5*e+g)/2.5;J=(n-j)*(l-d)/(l-h)+e-n;j+=J;n+=J;if(j>a&&j>e){j=Ha(a,e);n=2*e-j}else if(j<a&&j<e){j=qb(a,e);n=2*e-j}if(n>g&&n>e){n=Ha(g,e);j=2*e-n}else if(n<g&&n<e){n=qb(g,e);j=2*e-n}b.rightContX=l;b.rightContY=n}if(c){b=["C",f.rightContX||
-f.plotX,f.rightContY||f.plotY,h||d,j||e,d,e];f.rightContX=f.rightContY=null}else b=[ab,d,e];return b}});vb.spline=la;la=yb(la,{type:"areaspline"});vb.areaspline=la;var ad=yb(pb,{type:"column",pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color",r:"borderRadius"},init:function(){pb.prototype.init.apply(this,arguments);var a=this,b=a.chart;b.hasColumn=true;b.hasRendered&&u(b.series,function(c){if(c.type===a.type)c.isDirty=true})},translate:function(){var a=this,b=a.chart,
-c=a.options,d=c.stacking,e=c.borderWidth,f=0,g=a.xAxis.reversed,h=a.xAxis.categories,j={},l,n;pb.prototype.translate.apply(a);u(b.series,function(S){if(S.type===a.type&&S.visible){if(S.options.stacking){l=S.stackKey;if(j[l]===Va)j[l]=f++;n=j[l]}else n=f++;S.columnIndex=n}});var J=a.data,D=a.closestPoints;h=$a(J[1]?J[D].plotX-J[D-1].plotX:b.plotSizeX/(h&&h.length||1));D=h*c.groupPadding;var aa=(h-2*D)/f,E=c.pointWidth,da=M(E)?(aa-E)/2:aa*c.pointPadding,w=Ha(C(E,aa-2*da),1),R=da+(D+((g?f-a.columnIndex:
-a.columnIndex)||0)*aa-h/2)*(g?-1:1),B=a.yAxis.getThreshold(c.threshold||0),K=C(c.minPointLength,5);u(J,function(S){var I=S.plotY,za=S.yBottom||B,Da=S.plotX+R,gb=fd(qb(I,za)),wb=fd(Ha(I,za)-gb),Ob=a.yAxis.stacks[(S.y<0?"-":"")+a.stackKey],Kb;d&&a.visible&&Ob&&Ob[S.x]&&Ob[S.x].setOffset(R,w);if($a(wb)<K){if(K){wb=K;gb=$a(gb-B)>K?za-K:B-(I<=B?K:0)}Kb=gb-3}pa(S,{barX:Da,barY:gb,barW:w,barH:wb});S.shapeType="rect";I=pa(b.renderer.Element.prototype.crisp.apply({},[e,Da,gb,w,wb]),{r:c.borderRadius});if(e%
-2){I.y-=1;I.height+=1}S.shapeArgs=I;S.trackerArgs=M(Kb)&&va(S.shapeArgs,{height:Ha(6,wb+3),y:Kb})})},getSymbol:function(){},drawGraph:function(){},drawPoints:function(){var a=this,b=a.options,c=a.chart.renderer,d,e;u(a.data,function(f){var g=f.plotY;if(g!==Va&&!isNaN(g)&&f.y!==null){d=f.graphic;e=f.shapeArgs;if(d){Tc(d);d.animate(e)}else f.graphic=c[f.shapeType](e).attr(f.pointAttr[f.selected?"select":hb]).add(a.group).shadow(b.shadow)}})},drawTracker:function(){var a=this,b=a.chart,c=b.renderer,
-d,e,f=+new Date,g=a.options.cursor,h=g&&{cursor:g},j;u(a.data,function(l){e=l.tracker;d=l.trackerArgs||l.shapeArgs;delete d.strokeWidth;if(l.y!==null)if(e)e.attr(d);else l.tracker=c[l.shapeType](d).attr({isTracker:f,fill:Wd,visibility:a.visible?Ab:ub,zIndex:1}).on(Jb?"touchstart":"mouseover",function(n){j=n.relatedTarget||n.fromElement;b.hoverSeries!==a&&Ea(j,"isTracker")!==f&&a.onMouseOver();l.onMouseOver()}).on("mouseout",function(n){if(!a.options.stickyTracking){j=n.relatedTarget||n.toElement;
-Ea(j,"isTracker")!==f&&a.onMouseOut()}}).css(h).add(l.group||b.trackerGroup)})},animate:function(a){var b=this,c=b.data;if(!a){u(c,function(d){var e=d.graphic;d=d.shapeArgs;if(e){e.attr({height:0,y:b.yAxis.translate(0,0,1)});e.animate({height:d.height,y:d.y},b.options.animation)}});b.animate=null}},remove:function(){var a=this,b=a.chart;b.hasRendered&&u(b.series,function(c){if(c.type===a.type)c.isDirty=true});pb.prototype.remove.apply(a,arguments)}});vb.column=ad;la=yb(ad,{type:"bar",init:function(a){a.inverted=
-this.inverted=true;ad.prototype.init.apply(this,arguments)}});vb.bar=la;la=yb(pb,{type:"scatter",translate:function(){var a=this;pb.prototype.translate.apply(a);u(a.data,function(b){b.shapeType="circle";b.shapeArgs={x:b.plotX,y:b.plotY,r:a.chart.options.tooltip.snap}})},drawTracker:function(){var a=this,b=a.options.cursor,c=b&&{cursor:b},d;u(a.data,function(e){(d=e.graphic)&&d.attr({isTracker:true}).on("mouseover",function(){a.onMouseOver();e.onMouseOver()}).on("mouseout",function(){a.options.stickyTracking||
-a.onMouseOut()}).css(c)})},cleanData:function(){}});vb.scatter=la;la=yb(Ac,{init:function(){Ac.prototype.init.apply(this,arguments);var a=this,b;pa(a,{visible:a.visible!==false,name:C(a.name,"Slice")});b=function(){a.slice()};Sa(a,"select",b);Sa(a,"unselect",b);return a},setVisible:function(a){var b=this.series.chart,c=this.tracker,d=this.dataLabel,e=this.connector,f=this.shadowGroup,g;g=(this.visible=a=a===Va?!this.visible:a)?"show":"hide";this.group[g]();c&&c[g]();d&&d[g]();e&&e[g]();f&&f[g]();
-this.legendItem&&b.legend.colorizeItem(this,a)},slice:function(a,b,c){var d=this.series.chart,e=this.slicedTranslation;ec(c,d);C(b,true);a=this.sliced=M(a)?a:!this.sliced;a={translateX:a?e[0]:d.plotLeft,translateY:a?e[1]:d.plotTop};this.group.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)}});la=yb(pb,{type:"pie",isCartesian:false,pointClass:la,pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth",fill:"color"},getColor:function(){this.initialColor=this.chart.counters.color},
-animate:function(){var a=this;u(a.data,function(b){var c=b.graphic;b=b.shapeArgs;var d=-cc/2;if(c){c.attr({r:0,start:d,end:d});c.animate({r:b.r,start:b.start,end:b.end},a.options.animation)}});a.animate=null},translate:function(){var a=0,b=this,c=-0.25,d=b.options,e=d.slicedOffset,f=e+d.borderWidth,g=d.center.concat([d.size,d.innerSize||0]),h=b.chart,j=h.plotWidth,l=h.plotHeight,n,J,D,aa=b.data,E=2*cc,da,w=qb(j,l),R,B,K,S=d.dataLabels.distance;g=mc(g,function(I,za){return(R=/%$/.test(I))?[j,l,w,w][za]*
-ja(I)/100:I});b.getX=function(I,za){D=sa.asin((I-g[1])/(g[2]/2+S));return g[0]+(za?-1:1)*nb(D)*(g[2]/2+S)};b.center=g;u(aa,function(I){a+=I.y});u(aa,function(I){da=a?I.y/a:0;n=X(c*E*1E3)/1E3;c+=da;J=X(c*E*1E3)/1E3;I.shapeType="arc";I.shapeArgs={x:g[0],y:g[1],r:g[2]/2,innerR:g[3]/2,start:n,end:J};D=(J+n)/2;I.slicedTranslation=mc([nb(D)*e+h.plotLeft,Db(D)*e+h.plotTop],X);B=nb(D)*g[2]/2;b.radiusY=K=Db(D)*g[2]/2;I.tooltipPos=[g[0]+B*0.7,g[1]+K*0.7];I.labelPos=[g[0]+B+nb(D)*S,g[1]+K+Db(D)*S,g[0]+B+nb(D)*
-f,g[1]+K+Db(D)*f,g[0]+B,g[1]+K,S<0?"center":D<E/4?"left":"right",D];I.percentage=da*100;I.total=a});this.setTooltipPoints()},render:function(){this.drawPoints();this.options.enableMouseTracking!==false&&this.drawTracker();this.drawDataLabels();this.options.animation&&this.animate&&this.animate();this.isDirty=false},drawPoints:function(){var a=this.chart,b=a.renderer,c,d,e,f=this.options.shadow,g,h;u(this.data,function(j){d=j.graphic;h=j.shapeArgs;e=j.group;g=j.shadowGroup;if(f&&!g)g=j.shadowGroup=
-b.g("shadow").attr({zIndex:4}).add();if(!e)e=j.group=b.g("point").attr({zIndex:5}).add();c=j.sliced?j.slicedTranslation:[a.plotLeft,a.plotTop];e.translate(c[0],c[1]);g&&g.translate(c[0],c[1]);if(d)d.animate(h);else j.graphic=b.arc(h).attr(pa(j.pointAttr[hb],{"stroke-linejoin":"round"})).add(j.group).shadow(f,g);j.visible===false&&j.setVisible(false)})},drawDataLabels:function(){var a=this.data,b,c=this.chart,d=this.options.dataLabels,e=C(d.connectorPadding,10),f=C(d.connectorWidth,1),g,h,j=d.distance,
-l=this.radiusY,n=j>0,J=this.center[1],D=[[],[]],aa,E,da,w,R=2,B;if(d.enabled){pb.prototype.drawDataLabels.apply(this);u(a,function(gb){D[gb.labelPos[7]<cc/2?0:1].push(gb)});D[1].reverse();w=function(gb,wb){return wb.y-gb.y};for(a=D[0][0]&&D[0][0].dataLabel&&ja(D[0][0].dataLabel.styles.lineHeight);R--;){var K=[],S=[],I=D[R],za=I.length,Da;for(B=J+l-j;B<=J-l+j;B+=a)K.push(B);da=K.length;if(za>da){h=[].concat(I);h.sort(w);for(B=za;B--;)h[B].rank=B;for(B=za;B--;)I[B].rank>=da&&I.splice(B,1);za=I.length}for(B=
-0;B<za;B++){b=I[B];h=b.labelPos;b=9999;for(E=0;E<da;E++){g=$a(K[E]-h[1]);if(g<b){b=g;Da=E}}if(Da<B&&K[B]!==null)Da=B;else if(da<za-B+Da&&K[B]!==null)Da=da-za+B;else for(;K[Da]===null;)Da++;S.push({i:Da,y:K[Da]});K[Da]=null}S.sort(w);for(B=0;B<za;B++){b=I[B];h=b.labelPos;g=b.dataLabel;E=S.pop();aa=h[1];da=b.visible===false?ub:Ab;Da=E.i;E=E.y;if(aa>E&&K[Da+1]!==null||aa<E&&K[Da-1]!==null)E=aa;aa=this.getX(E,R);g.attr({visibility:da,align:h[6]})[g.moved?"animate":"attr"]({x:aa+d.x+({left:e,right:-e}[h[6]]||
-0),y:E+d.y});g.moved=true;if(n&&f){g=b.connector;h=[ab,aa+(h[6]==="left"?5:-5),E,La,aa,E,La,h[2],h[3],La,h[4],h[5]];if(g){g.animate({d:h});g.attr("visibility",da)}else b.connector=g=this.chart.renderer.path(h).attr({"stroke-width":f,stroke:d.connectorColor||"#606060",visibility:da,zIndex:3}).translate(c.plotLeft,c.plotTop).add()}}}}},drawTracker:ad.prototype.drawTracker,getSymbol:function(){}});vb.pie=la;cb.Highcharts={Chart:Gd,dateFormat:Nc,pathAnim:$c,getOptions:function(){return Wa},numberFormat:zd,
-Point:Ac,Color:Yb,Renderer:Wc,seriesTypes:vb,setOptions:function(a){Wa=va(Wa,a);Bd();return Wa},Series:pb,addEvent:Sa,createElement:ib,discardElement:Gc,css:Na,each:u,extend:pa,map:mc,merge:va,pick:C,extendClass:yb,product:"Highcharts",version:"2.1.6"}})();
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/jquery.min.js b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/jquery.min.js
deleted file mode 100755
index 89b15216..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/jquery.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v1.6.3 http://jquery.com/ | http://jquery.org/license */
-(function(a,b){function cu(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cr(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cq(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cp(){cn=b}function co(){setTimeout(cp,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bA.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bW(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bP,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bW(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bW(a,c,d,e,"*",g));return l}function bV(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bL),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function by(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bt:bu;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bv(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bl(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bd,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bk(a){f.nodeName(a,"input")?bj(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bj)}function bj(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bi(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bh(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bg(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bf(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function V(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(Q.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function U(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function M(a,b){return(a&&a!=="*"?a+".":"")+b.replace(y,"`").replace(z,"&")}function L(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(w,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function J(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function D(){return!0}function C(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function K(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(K,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.3",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;B.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:H?function(a){return a==null?"":H.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?F.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(!b)return-1;if(I)return I.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=G.call(arguments,2),g=function(){return a.apply(c,f.concat(G.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){J["[object "+b+"]"]=b.toLowerCase()}),A=e.uaMatch(z),A.browser&&(e.browser[A.browser]=!0,e.browser.version=A.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?C=function(){c.removeEventListener("DOMContentLoaded",C,!1),e.ready()}:c.attachEvent&&(C=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",C),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g+"With"](this===b?d:this,[h])}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type=checkbox>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0,background:"none"},m&&f.extend(p,{position:"absolute",left:"-1000px",top:"-1000px"});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i=f.expando,j=typeof c=="string",k=a.nodeType,l=k?f.cache:a,m=k?a[f.expando]:a[f.expando]&&f.expando;if((!m||e&&m&&l[m]&&!l[m][i])&&j&&d===b)return;m||(k?a[f.expando]=m=++f.uuid:m=f.expando),l[m]||(l[m]={},k||(l[m].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?l[m][i]=f.extend(l[m][i],c):l[m]=f.extend(l[m],c);g=l[m],e&&(g[i]||(g[i]={}),g=g[i]),d!==b&&(g[f.camelCase(c)]=d);if(c==="events"&&!g[c])return g[i]&&g[i].events;j?(h=g[c],h==null&&(h=g[f.camelCase(c)])):h=g;return h}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e=f.expando,g=a.nodeType,h=g?f.cache:a,i=g?a[f.expando]:f.expando;if(!h[i])return;if(b){d=c?h[i][e]:h[i];if(d){d[b]||(b=f.camelCase(b)),delete d[b];if(!l(d))return}}if(c){delete h[i][e];if(!l(h[i]))return}var j=h[i][e];f.support.deleteExpando||!h.setInterval?delete h[i]:h[i]=null,j?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=j):g&&(f.support.deleteExpando?delete a[f.expando]:a.removeAttribute?a.removeAttribute(f.expando):a[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u,v;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=v:u&&(i=u)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.attr(a,b,""),a.removeAttribute(b),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(u&&f.nodeName(a,"button"))return u.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(u&&f.nodeName(a,"button"))return u.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==null?g:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabIndex=f.propHooks.tabIndex,v={get:function(a,c){var d;return f.prop(a,c)===!0||(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(u=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var w=/\.(.*)$/,x=/^(?:textarea|input|select)$/i,y=/\./g,z=/ /g,A=/[^\w\s.|`]/g,B=function(a){return a.replace(A,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=C;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=C);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),B).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null
-,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,M(a.origType,a.selector),f.extend({},a,{handler:L,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,M(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?D:C):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=D;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=D;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=D,this.stopPropagation()},isDefaultPrevented:C,isPropagationStopped:C,isImmediatePropagationStopped:C};var E=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},F=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?F:E,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?F:E)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="submit"||c==="image")&&f(b).closest("form").length&&J("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&J("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var G,H=function(a){var b=f.nodeName(a,"input")?a.type:"",c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},I=function(c){var d=c.target,e,g;if(!!x.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=H(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:I,beforedeactivate:I,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&I.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&I.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",H(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in G)f.event.add(this,c+".specialChange",G[c]);return x.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return x.test(this.nodeName)}},G=f.event.special.change.filters,G.focus=G.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var K={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||C,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=w.exec(h),k="",j&&(k=j[0],h=h.replace(w,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,K[h]?(a.push(K[h]+k),h=h+k):h=(K[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+M(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+M(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var N=/Until$/,O=/^(?:parents|prevUntil|prevAll)/,P=/,/,Q=/^.[^:#\[\.,]*$/,R=Array.prototype.slice,S=f.expr.match.POS,T={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(V(this,a,!1),"not",a)},filter:function(a){return this.pushStack(V(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=S.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=S.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(U(c[0])||U(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=R.call(arguments);N.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!T[a]?f.unique(e):e,(this.length>1||P.test(d))&&O.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|object|embed|option|style)/i,bb=/checked\s*(?:[^=]|=\s*.checked.)/i,bc=/\/(java|ecma)script/i,bd=/^\s*<!(?:\[CDATA\[|\-\-)/,be={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};be.optgroup=be.option,be.tbody=be.tfoot=be.colgroup=be.caption=be.thead,be.th=be.td,f.support.htmlSerialize||(be._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!be[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bb.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bf(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bl)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!ba.test(a[0])&&(f.support.checkClone||!bb.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);
-return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bh(a,d),e=bi(a),g=bi(d);for(h=0;e[h];++h)g[h]&&bh(e[h],g[h])}if(b){bg(a,d);if(c){e=bi(a),g=bi(d);for(h=0;e[h];++h)bg(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!_.test(k))k=b.createTextNode(k);else{k=k.replace(Y,"<$1></$2>");var l=(Z.exec(k)||["",""])[1].toLowerCase(),m=be[l]||be._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=$.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&X.test(k)&&o.insertBefore(b.createTextNode(X.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bk(k[i]);else bk(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bc.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bm=/alpha\([^)]*\)/i,bn=/opacity=([^)]*)/,bo=/([A-Z]|^ms)/g,bp=/^-?\d+(?:px)?$/i,bq=/^-?\d/,br=/^([\-+])=([\-+.\de]+)/,bs={position:"absolute",visibility:"hidden",display:"block"},bt=["Left","Right"],bu=["Top","Bottom"],bv,bw,bx;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bv(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=br.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bv)return bv(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return by(a,b,d);f.swap(a,bs,function(){e=by(a,b,d)});return e}},set:function(a,b){if(!bp.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bn.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bm,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bm.test(g)?g.replace(bm,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bv(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bw=function(a,c){var d,e,g;c=c.replace(bo,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bx=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bp.test(d)&&bq.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bv=bw||bx,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bz=/%20/g,bA=/\[\]$/,bB=/\r?\n/g,bC=/#.*$/,bD=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bE=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bF=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bG=/^(?:GET|HEAD)$/,bH=/^\/\//,bI=/\?/,bJ=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bK=/^(?:select|textarea)/i,bL=/\s+/,bM=/([?&])_=[^&]*/,bN=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bO=f.fn.load,bP={},bQ={},bR,bS,bT=["*/"]+["*"];try{bR=e.href}catch(bU){bR=c.createElement("a"),bR.href="",bR=bR.href}bS=bN.exec(bR.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bO)return bO.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bJ,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bK.test(this.nodeName)||bE.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bB,"\r\n")}}):{name:b.name,value:c.replace(bB,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?bX(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),bX(a,b);return a},ajaxSettings:{url:bR,isLocal:bF.test(bS[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bT},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bV(bP),ajaxTransport:bV(bQ),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?bZ(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=b$(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bD.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bC,"").replace(bH,bS[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bL),d.crossDomain==null&&(r=bN.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bS[1]&&r[2]==bS[2]&&(r[3]||(r[1]==="http:"?80:443))==(bS[3]||(bS[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bW(bP,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bG.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bI.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bM,"$1_="+x);d.url=y+(y===d.url?(bI.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bT+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bW(bQ,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bz,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cq("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cr(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cq("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cq("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cr(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cq("show",1),slideUp:cq("hide",1),slideToggle:cq("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return d.step(a)}var d=this,e=f.fx;this.startTime=cn||co(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&f.timers.push(g)&&!cl&&(cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||co(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cs=/^t(?:able|d|h)$/i,ct=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cu(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!cs.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=ct.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!ct.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cu(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cu(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNaN(j)?i:j}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
deleted file mode 100755
index 89fc519b..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist
+++ /dev/null
@@ -1,19 +0,0 @@
-        <tr>
-          <td class="coverFile" colspan="4">{name}</td>
-          <td class="coverBar">
-            <div class="coverBarOutline" title="{methods_tested_percent}">
-                <div class="size {methods_color}"  style="width:{methods_tested_width}%" title="{methods_tested_percent}"></div>
-            </div>
-          </td>
-          <td class="coverPer{methods_level}">{methods_tested_percent}</td>
-          <td class="coverNum{methods_level}">{methods_number}</td>
-          <td class="crap">{crap}</td>
-          <td class="coverBar">
-              <div class="coverBarOutline" title="{lines_executed_percent}">
-                  <div class="size {lines_color}"  style="width:{lines_executed_width}%" title="{lines_executed_percent}"></div>
-              </div>
-          </td>
-          <td class="coverPer{lines_level}">{lines_executed_percent}</td>
-          <td class="coverNum{lines_level}">{num_executed_lines} / {num_executable_lines}</td>
-        </tr>
-
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/style.css b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/style.css
deleted file mode 100755
index 3070a607..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/style.css
+++ /dev/null
@@ -1,500 +0,0 @@
-/* All views: initial background and text color */
-body
-{
-  background-color: #fff;
-  color: #2e3436;
-  font-family: arial, helvetica, sans-serif;
-  font-size: 12px;
-  margin: 0 auto;
-  width: 100%;
-}
-
-/* All views: standard link format*/
-a:link
-{
-  color: #2e3436;
-  text-decoration: underline;
-}
-
-/* All views: standard link - visited format */
-a:visited
-{
-  color: #2e3436;
-  text-decoration: underline;
-}
-
-/* All views: standard link - activated format */
-a:active
-{
-  color: #2e3436;
-  text-decoration: underline;
-}
-
-/* All views: main title format */
-td.title
-{
-  text-align: center;
-  padding: 10px;
-  font-family: sans-serif;
-  font-style: italic;
-  font-weight: bold;
-  font-size: 1.6em;
-}
-
-/* All views: header item format */
-td.headerItem
-{
-  text-align: right;
-  padding-right: 6px;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* All views: header item value format */
-td.headerValue
-{
-  text-align: left;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* All views: header legend item format */
-td.legendItem
-{
-  text-align: right;
-  padding-right: 6px;
-  padding-top: 10px;
-  padding-bottom: 2px;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* All views: header legend item value format */
-td.legendValue
-{
-  text-align: left;
-  padding-top: 10px;
-  padding-bottom: 2px;
-  color:  #2e3436;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* All views: color of horizontal ruler */
-td.ruler
-{
-  background-color: #d3d7cf;
-}
-
-/* All views: version string format */
-td.versionInfo
-{
-  text-align: center;
-  padding-top: 2px;
-  font-family: sans-serif;
-  font-style: italic;
-}
-
-/* Directory view/File view (all)/Test case descriptions:
-table headline format */
-td.tableHead
-{
-  text-align: center;
-  color: #ffffff;
-  background-color: #555753;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): filename entry format */
-td.coverItem, td.coverDirectory, td.coverFile
-{
-  text-align: left;
-  padding-left: 10px;
-  padding-right: 20px;
-  background-color: #d3d7cf;
-  font-family: monospace;
-}
-
-td.coverDirectory
-{
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): bar-graph entry format*/
-td.coverBar
-{
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #d3d7cf;
-  text-align:center;
-  width: 100px;
-}
-
-/* Directory view/File view (all): bar-graph outline color */
-div.coverBarOutline
-{
-  background-color: #fff;
-  border: 1px solid #2e3436;
-  height: 10px;
-  overflow:hidden;
-  width: 100px;
-}
-
-/* Directory view/File view (all): common style for bar-graph  */
-div.coverBarOutline div.size
-{
-    height: 10px; float:left;
-}
-
-/* Directory view/File view (all): bar-graph color no coverage rate */
-div.coverBarOutline div.snow
-{
-    background-color:#fff;
-}
-
-/* Directory view/File view (all): bar-graph color for low coverage rate */
-div.coverBarOutline div.scarlet_red
-{
-    background-color:#ef2929;
-}
-
-/* Directory view/File view (all): bar-graph color for middle coverage rate */
-div.coverBarOutline div.butter
-{
-    background-color:#fce94f;
-}
-
-/* Directory view/File view (all):  bar-graph color for high coverage rate */
-div.coverBarOutline div.chameleon
-{
-    background-color:#8ae234;
-}
-
-/* Directory view/File view (all): percentage entry for files with
-no coverage rate */
-td.coverPerNone
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #d3d7cf;
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): line count entry for files with
-no coverage rate */
-td.coverNumNone
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #d3d7cf;
-  white-space: nowrap;
-}
-
-/* Directory view/File view (all): percentage entry for files with
-high coverage rate */
-td.coverPerHi
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #8ae234;
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): line count entry for files with
-high coverage rate */
-td.coverNumHi
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #8ae234;
-  white-space: nowrap;
-}
-
-/* Directory view/File view (all): legend entry for high coverage
-rate */
-span.coverLegendHi
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #8ae234;
-}
-
-/* Directory view/File view (all): percentage entry for files with
-medium coverage rate */
-td.coverPerMed
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #fce94f;
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): line count entry for files with
-medium coverage rate */
-td.coverNumMed
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #fce94f;
-  white-space: nowrap;
-}
-
-/* Directory view/File view (all): legend entry for medium coverage
-rate */
-span.coverLegendMed
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-right: 2px;
-  background-color: #fce94f;
-}
-
-/* Directory view/File view (all): percentage entry for files with
-low coverage rate */
-td.coverPerLo
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #f57900;
-  font-weight: bold;
-}
-
-/* Directory view/File view (all): line count entry for files with
-low coverage rate */
-td.coverNumLo
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #f57900;
-  white-space: nowrap;
-}
-
-/* Directory view/File view (all): legend entry for low coverage
-rate */
-span.coverLegendLo
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  margin-right: 2px;
-  background-color: #f57900;
-}
-
-/* File view (all): "show/hide details" link format */
-a.detail:link
-{
-  color: #ffffff;
-}
-
-/* File view (all): "show/hide details" link - visited format */
-a.detail:visited
-{
-  color: #ffffff;
-}
-
-/* File view (all): "show/hide details" link - activated format */
-a.detail:active
-{
-  color: #ffffff;
-}
-
-/* File view (detail): test name table headline format */
-td.testNameHead
-{
-  text-align: left;
-  padding-left: 10px;
-  background-color: #729fcf;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* File view (detail): test lines table headline format */
-td.testLinesHead
-{
-  text-align: center;
-  background-color: #729fcf;
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* File view (detail): test name entry */
-td.testName
-{
-  text-align: left;
-  padding-left: 10px;
-  background-color: #729fcf;
-}
-
-/* File view (detail): test percentage entry */
-td.testPer
-{
-  text-align: right;
-  vertical-align: top;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #729fcf;
-}
-
-/* File view (detail): test lines count entry */
-td.testNum
-{
-  text-align: right;
-  vertical-align: top;
-  padding-left: 10px;
-  padding-right: 10px;
-  background-color: #729fcf;
-  white-space: nowrap;
-}
-
-/* Test case descriptions: test name format*/
-dt
-{
-  font-family: sans-serif;
-  font-weight: bold;
-}
-
-/* Test case descriptions: description table body */
-td.testDescription
-{
-  padding-top: 10px;
-  padding-left: 30px;
-  padding-bottom: 10px;
-  padding-right: 30px;
-  background-color: #729fcf;
-}
-
-/* Source code view: source code format */
-pre.source
-{
-  font-family: monospace;
-  white-space: pre;
-}
-
-/* Source code view: line number format */
-span.lineNum
-{
-  background-color: #d3d7cf;
-}
-
-span.lineNum a {
-  text-decoration: none;
-}
-
-/* Source code view: format for lines which were executed */
-span.lineCov
-{
-  background-color: #8ae234;
-}
-
-/* Source code view: format for Cov legend */
-span.LegendCov
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  margin-right: 2px;
-  background-color: #8ae234;
-}
-
-/* Source code view: format for lines which were not executed */
-span.lineNoCov
-{
-  background-color: #f57900;
-}
-
-/* Source code view: format for NoCov legend */
-span.LegendNoCov
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  margin-right: 2px;
-  background-color: #f57900;
-}
-
-/* Source code view: format for lines which are dead code */
-span.lineDeadCode
-{
-  background-color: #d3d7cf;
-}
-
-/* Source code view: format for NoCov legend */
-span.LegendDeadCode
-{
-  text-align: center;
-  padding-left: 10px;
-  padding-right: 10px;
-  margin-right: 2px;
-  background-color: #d3d7cf;
-}
-
-/* Test view: format for tests which have passed */
-li.testPassed
-{
-}
-
-/* Test view: format for tests which failed */
-li.testFailure
-{
-  background-color: #f57900;
-}
-
-/* Test view: format for tests which failed with an error */
-li.testError
-{
-  background-color: #f57900;
-}
-
-/* Test view: format for incomplete and skipped tests */
-li.testIncomplete
-{
-  background-color: #fcaf3e;
-}
-
-/* CRAP */
-td.crap
-{
-  text-align: right;
-  padding-left: 10px;
-  padding-right: 20px;
-  background-color: #d3d7cf;
-}
-
-pre span.comment {
-  color: #888a85;
-}
-
-pre span.default {
-  color: #2e3436;
-}
-
-pre span.html {
-  color: #888a85;
-}
-
-pre span.keyword {
-  color: #2e3436;
-  font-weight: bold;
-}
-
-pre span.string {
-  color: #2e3436;
-}
-
-#classCoverageDistribution, #classComplexity {
-	height: 200px;
-	width: 475px;
-}
\ No newline at end of file
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yahoo-dom-event.js b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yahoo-dom-event.js
deleted file mode 100755
index 46c58bfe..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yahoo-dom-event.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-Copyright (c) 2011, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.com/yui/license.html
-version: 2.9.0
-*/
-if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var b=arguments,g=null,e,c,f;for(e=0;e<b.length;e=e+1){f=(""+b[e]).split(".");g=YAHOO;for(c=(f[0]=="YAHOO")?1:0;c<f.length;c=c+1){g[f[c]]=g[f[c]]||{};g=g[f[c]];}}return g;};YAHOO.log=function(d,a,c){var b=YAHOO.widget.Logger;if(b&&b.log){return b.log(d,a,c);}else{return false;}};YAHOO.register=function(a,f,e){var k=YAHOO.env.modules,c,j,h,g,d;if(!k[a]){k[a]={versions:[],builds:[]};}c=k[a];j=e.version;h=e.build;g=YAHOO.env.listeners;c.name=a;c.version=j;c.build=h;c.versions.push(j);c.builds.push(h);c.mainClass=f;for(d=0;d<g.length;d=d+1){g[d](c);}if(f){f.VERSION=j;f.BUILD=h;}else{YAHOO.log("mainClass is undefined for module "+a,"warn");}};YAHOO.env=YAHOO.env||{modules:[],listeners:[]};YAHOO.env.getVersion=function(a){return YAHOO.env.modules[a]||null;};YAHOO.env.parseUA=function(d){var e=function(i){var j=0;return parseFloat(i.replace(/\./g,function(){return(j++==1)?"":".";}));},h=navigator,g={ie:0,opera:0,gecko:0,webkit:0,chrome:0,mobile:null,air:0,ipad:0,iphone:0,ipod:0,ios:null,android:0,webos:0,caja:h&&h.cajaVersion,secure:false,os:null},c=d||(navigator&&navigator.userAgent),f=window&&window.location,b=f&&f.href,a;g.secure=b&&(b.toLowerCase().indexOf("https")===0);if(c){if((/windows|win32/i).test(c)){g.os="windows";}else{if((/macintosh/i).test(c)){g.os="macintosh";}else{if((/rhino/i).test(c)){g.os="rhino";}}}if((/KHTML/).test(c)){g.webkit=1;}a=c.match(/AppleWebKit\/([^\s]*)/);if(a&&a[1]){g.webkit=e(a[1]);if(/ Mobile\//.test(c)){g.mobile="Apple";a=c.match(/OS ([^\s]*)/);if(a&&a[1]){a=e(a[1].replace("_","."));}g.ios=a;g.ipad=g.ipod=g.iphone=0;a=c.match(/iPad|iPod|iPhone/);if(a&&a[0]){g[a[0].toLowerCase()]=g.ios;}}else{a=c.match(/NokiaN[^\/]*|Android \d\.\d|webOS\/\d\.\d/);if(a){g.mobile=a[0];}if(/webOS/.test(c)){g.mobile="WebOS";a=c.match(/webOS\/([^\s]*);/);if(a&&a[1]){g.webos=e(a[1]);}}if(/ Android/.test(c)){g.mobile="Android";a=c.match(/Android ([^\s]*);/);if(a&&a[1]){g.android=e(a[1]);}}}a=c.match(/Chrome\/([^\s]*)/);if(a&&a[1]){g.chrome=e(a[1]);}else{a=c.match(/AdobeAIR\/([^\s]*)/);if(a){g.air=a[0];}}}if(!g.webkit){a=c.match(/Opera[\s\/]([^\s]*)/);if(a&&a[1]){g.opera=e(a[1]);a=c.match(/Version\/([^\s]*)/);if(a&&a[1]){g.opera=e(a[1]);}a=c.match(/Opera Mini[^;]*/);if(a){g.mobile=a[0];}}else{a=c.match(/MSIE\s([^;]*)/);if(a&&a[1]){g.ie=e(a[1]);}else{a=c.match(/Gecko\/([^\s]*)/);if(a){g.gecko=1;a=c.match(/rv:([^\s\)]*)/);if(a&&a[1]){g.gecko=e(a[1]);}}}}}}return g;};YAHOO.env.ua=YAHOO.env.parseUA();(function(){YAHOO.namespace("util","widget","example");if("undefined"!==typeof YAHOO_config){var b=YAHOO_config.listener,a=YAHOO.env.listeners,d=true,c;if(b){for(c=0;c<a.length;c++){if(a[c]==b){d=false;break;}}if(d){a.push(b);}}}})();YAHOO.lang=YAHOO.lang||{};(function(){var f=YAHOO.lang,a=Object.prototype,c="[object Array]",h="[object Function]",i="[object Object]",b=[],g={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","/":"&#x2F;","`":"&#x60;"},d=["toString","valueOf"],e={isArray:function(j){return a.toString.apply(j)===c;},isBoolean:function(j){return typeof j==="boolean";},isFunction:function(j){return(typeof j==="function")||a.toString.apply(j)===h;},isNull:function(j){return j===null;},isNumber:function(j){return typeof j==="number"&&isFinite(j);},isObject:function(j){return(j&&(typeof j==="object"||f.isFunction(j)))||false;},isString:function(j){return typeof j==="string";},isUndefined:function(j){return typeof j==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(l,k){var j,n,m;for(j=0;j<d.length;j=j+1){n=d[j];m=k[n];if(f.isFunction(m)&&m!=a[n]){l[n]=m;}}}:function(){},escapeHTML:function(j){return j.replace(/[&<>"'\/`]/g,function(k){return g[k];});},extend:function(m,n,l){if(!n||!m){throw new Error("extend failed, please check that "+"all dependencies are included.");}var k=function(){},j;k.prototype=n.prototype;m.prototype=new k();m.prototype.constructor=m;m.superclass=n.prototype;if(n.prototype.constructor==a.constructor){n.prototype.constructor=n;}if(l){for(j in l){if(f.hasOwnProperty(l,j)){m.prototype[j]=l[j];}}f._IEEnumFix(m.prototype,l);}},augmentObject:function(n,m){if(!m||!n){throw new Error("Absorb failed, verify dependencies.");}var j=arguments,l,o,k=j[2];if(k&&k!==true){for(l=2;l<j.length;l=l+1){n[j[l]]=m[j[l]];}}else{for(o in m){if(k||!(o in n)){n[o]=m[o];}}f._IEEnumFix(n,m);}return n;},augmentProto:function(m,l){if(!l||!m){throw new Error("Augment failed, verify dependencies.");}var j=[m.prototype,l.prototype],k;for(k=2;k<arguments.length;k=k+1){j.push(arguments[k]);}f.augmentObject.apply(this,j);return m;},dump:function(j,p){var l,n,r=[],t="{...}",k="f(){...}",q=", ",m=" => ";if(!f.isObject(j)){return j+"";}else{if(j instanceof Date||("nodeType" in j&&"tagName" in j)){return j;}else{if(f.isFunction(j)){return k;}}}p=(f.isNumber(p))?p:3;if(f.isArray(j)){r.push("[");for(l=0,n=j.length;l<n;l=l+1){if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}if(r.length>1){r.pop();}r.push("]");}else{r.push("{");for(l in j){if(f.hasOwnProperty(j,l)){r.push(l+m);if(f.isObject(j[l])){r.push((p>0)?f.dump(j[l],p-1):t);}else{r.push(j[l]);}r.push(q);}}if(r.length>1){r.pop();}r.push("}");}return r.join("");},substitute:function(x,y,E,l){var D,C,B,G,t,u,F=[],p,z=x.length,A="dump",r=" ",q="{",m="}",n,w;for(;;){D=x.lastIndexOf(q,z);if(D<0){break;}C=x.indexOf(m,D);if(D+1>C){break;}p=x.substring(D+1,C);G=p;u=null;B=G.indexOf(r);if(B>-1){u=G.substring(B+1);G=G.substring(0,B);}t=y[G];if(E){t=E(G,t,u);}if(f.isObject(t)){if(f.isArray(t)){t=f.dump(t,parseInt(u,10));}else{u=u||"";n=u.indexOf(A);if(n>-1){u=u.substring(4);}w=t.toString();if(w===i||n>-1){t=f.dump(t,parseInt(u,10));}else{t=w;}}}else{if(!f.isString(t)&&!f.isNumber(t)){t="~-"+F.length+"-~";F[F.length]=p;}}x=x.substring(0,D)+t+x.substring(C+1);if(l===false){z=D-1;}}for(D=F.length-1;D>=0;D=D-1){x=x.replace(new RegExp("~-"+D+"-~"),"{"+F[D]+"}","g");}return x;},trim:function(j){try{return j.replace(/^\s+|\s+$/g,"");}catch(k){return j;
-}},merge:function(){var n={},k=arguments,j=k.length,m;for(m=0;m<j;m=m+1){f.augmentObject(n,k[m],true);}return n;},later:function(t,k,u,n,p){t=t||0;k=k||{};var l=u,s=n,q,j;if(f.isString(u)){l=k[u];}if(!l){throw new TypeError("method undefined");}if(!f.isUndefined(n)&&!f.isArray(s)){s=[n];}q=function(){l.apply(k,s||b);};j=(p)?setInterval(q,t):setTimeout(q,t);return{interval:p,cancel:function(){if(this.interval){clearInterval(j);}else{clearTimeout(j);}}};},isValue:function(j){return(f.isObject(j)||f.isString(j)||f.isNumber(j)||f.isBoolean(j));}};f.hasOwnProperty=(a.hasOwnProperty)?function(j,k){return j&&j.hasOwnProperty&&j.hasOwnProperty(k);}:function(j,k){return !f.isUndefined(j[k])&&j.constructor.prototype[k]!==j[k];};e.augmentObject(f,e,true);YAHOO.util.Lang=f;f.augment=f.augmentProto;YAHOO.augment=f.augmentProto;YAHOO.extend=f.extend;})();YAHOO.register("yahoo",YAHOO,{version:"2.9.0",build:"2800"});(function(){YAHOO.env._id_counter=YAHOO.env._id_counter||0;var e=YAHOO.util,k=YAHOO.lang,L=YAHOO.env.ua,a=YAHOO.lang.trim,B={},F={},m=/^t(?:able|d|h)$/i,w=/color$/i,j=window.document,v=j.documentElement,C="ownerDocument",M="defaultView",U="documentElement",S="compatMode",z="offsetLeft",o="offsetTop",T="offsetParent",x="parentNode",K="nodeType",c="tagName",n="scrollLeft",H="scrollTop",p="getBoundingClientRect",V="getComputedStyle",y="currentStyle",l="CSS1Compat",A="BackCompat",E="class",f="className",i="",b=" ",R="(?:^|\\s)",J="(?= |$)",t="g",O="position",D="fixed",u="relative",I="left",N="top",Q="medium",P="borderLeftWidth",q="borderTopWidth",d=L.opera,h=L.webkit,g=L.gecko,s=L.ie;e.Dom={CUSTOM_ATTRIBUTES:(!v.hasAttribute)?{"for":"htmlFor","class":f}:{"htmlFor":"for","className":E},DOT_ATTRIBUTES:{checked:true},get:function(aa){var ac,X,ab,Z,W,G,Y=null;if(aa){if(typeof aa=="string"||typeof aa=="number"){ac=aa+"";aa=j.getElementById(aa);G=(aa)?aa.attributes:null;if(aa&&G&&G.id&&G.id.value===ac){return aa;}else{if(aa&&j.all){aa=null;X=j.all[ac];if(X&&X.length){for(Z=0,W=X.length;Z<W;++Z){if(X[Z].id===ac){return X[Z];}}}}}}else{if(e.Element&&aa instanceof e.Element){aa=aa.get("element");}else{if(!aa.nodeType&&"length" in aa){ab=[];for(Z=0,W=aa.length;Z<W;++Z){ab[ab.length]=e.Dom.get(aa[Z]);}aa=ab;}}}Y=aa;}return Y;},getComputedStyle:function(G,W){if(window[V]){return G[C][M][V](G,null)[W];}else{if(G[y]){return e.Dom.IE_ComputedStyle.get(G,W);}}},getStyle:function(G,W){return e.Dom.batch(G,e.Dom._getStyle,W);},_getStyle:function(){if(window[V]){return function(G,Y){Y=(Y==="float")?Y="cssFloat":e.Dom._toCamel(Y);var X=G.style[Y],W;if(!X){W=G[C][M][V](G,null);if(W){X=W[Y];}}return X;};}else{if(v[y]){return function(G,Y){var X;switch(Y){case"opacity":X=100;try{X=G.filters["DXImageTransform.Microsoft.Alpha"].opacity;}catch(Z){try{X=G.filters("alpha").opacity;}catch(W){}}return X/100;case"float":Y="styleFloat";default:Y=e.Dom._toCamel(Y);X=G[y]?G[y][Y]:null;return(G.style[Y]||X);}};}}}(),setStyle:function(G,W,X){e.Dom.batch(G,e.Dom._setStyle,{prop:W,val:X});},_setStyle:function(){if(!window.getComputedStyle&&j.documentElement.currentStyle){return function(W,G){var X=e.Dom._toCamel(G.prop),Y=G.val;if(W){switch(X){case"opacity":if(Y===""||Y===null||Y===1){W.style.removeAttribute("filter");}else{if(k.isString(W.style.filter)){W.style.filter="alpha(opacity="+Y*100+")";if(!W[y]||!W[y].hasLayout){W.style.zoom=1;}}}break;case"float":X="styleFloat";default:W.style[X]=Y;}}else{}};}else{return function(W,G){var X=e.Dom._toCamel(G.prop),Y=G.val;if(W){if(X=="float"){X="cssFloat";}W.style[X]=Y;}else{}};}}(),getXY:function(G){return e.Dom.batch(G,e.Dom._getXY);},_canPosition:function(G){return(e.Dom._getStyle(G,"display")!=="none"&&e.Dom._inDoc(G));},_getXY:function(W){var X,G,Z,ab,Y,aa,ac=Math.round,ad=false;if(e.Dom._canPosition(W)){Z=W[p]();ab=W[C];X=e.Dom.getDocumentScrollLeft(ab);G=e.Dom.getDocumentScrollTop(ab);ad=[Z[I],Z[N]];if(Y||aa){ad[0]-=aa;ad[1]-=Y;}if((G||X)){ad[0]+=X;ad[1]+=G;}ad[0]=ac(ad[0]);ad[1]=ac(ad[1]);}else{}return ad;},getX:function(G){var W=function(X){return e.Dom.getXY(X)[0];};return e.Dom.batch(G,W,e.Dom,true);},getY:function(G){var W=function(X){return e.Dom.getXY(X)[1];};return e.Dom.batch(G,W,e.Dom,true);},setXY:function(G,X,W){e.Dom.batch(G,e.Dom._setXY,{pos:X,noRetry:W});},_setXY:function(G,Z){var aa=e.Dom._getStyle(G,O),Y=e.Dom.setStyle,ad=Z.pos,W=Z.noRetry,ab=[parseInt(e.Dom.getComputedStyle(G,I),10),parseInt(e.Dom.getComputedStyle(G,N),10)],ac,X;ac=e.Dom._getXY(G);if(!ad||ac===false){return false;}if(aa=="static"){aa=u;Y(G,O,aa);}if(isNaN(ab[0])){ab[0]=(aa==u)?0:G[z];}if(isNaN(ab[1])){ab[1]=(aa==u)?0:G[o];}if(ad[0]!==null){Y(G,I,ad[0]-ac[0]+ab[0]+"px");}if(ad[1]!==null){Y(G,N,ad[1]-ac[1]+ab[1]+"px");}if(!W){X=e.Dom._getXY(G);if((ad[0]!==null&&X[0]!=ad[0])||(ad[1]!==null&&X[1]!=ad[1])){e.Dom._setXY(G,{pos:ad,noRetry:true});}}},setX:function(W,G){e.Dom.setXY(W,[G,null]);},setY:function(G,W){e.Dom.setXY(G,[null,W]);},getRegion:function(G){var W=function(X){var Y=false;if(e.Dom._canPosition(X)){Y=e.Region.getRegion(X);}else{}return Y;};return e.Dom.batch(G,W,e.Dom,true);},getClientWidth:function(){return e.Dom.getViewportWidth();},getClientHeight:function(){return e.Dom.getViewportHeight();},getElementsByClassName:function(ab,af,ac,ae,X,ad){af=af||"*";ac=(ac)?e.Dom.get(ac):null||j;if(!ac){return[];}var W=[],G=ac.getElementsByTagName(af),Z=e.Dom.hasClass;for(var Y=0,aa=G.length;Y<aa;++Y){if(Z(G[Y],ab)){W[W.length]=G[Y];}}if(ae){e.Dom.batch(W,ae,X,ad);}return W;},hasClass:function(W,G){return e.Dom.batch(W,e.Dom._hasClass,G);},_hasClass:function(X,W){var G=false,Y;if(X&&W){Y=e.Dom._getAttribute(X,f)||i;if(Y){Y=Y.replace(/\s+/g,b);}if(W.exec){G=W.test(Y);}else{G=W&&(b+Y+b).indexOf(b+W+b)>-1;}}else{}return G;},addClass:function(W,G){return e.Dom.batch(W,e.Dom._addClass,G);},_addClass:function(X,W){var G=false,Y;if(X&&W){Y=e.Dom._getAttribute(X,f)||i;if(!e.Dom._hasClass(X,W)){e.Dom.setAttribute(X,f,a(Y+b+W));G=true;}}else{}return G;},removeClass:function(W,G){return e.Dom.batch(W,e.Dom._removeClass,G);},_removeClass:function(Y,X){var W=false,aa,Z,G;if(Y&&X){aa=e.Dom._getAttribute(Y,f)||i;e.Dom.setAttribute(Y,f,aa.replace(e.Dom._getClassRegex(X),i));Z=e.Dom._getAttribute(Y,f);if(aa!==Z){e.Dom.setAttribute(Y,f,a(Z));W=true;if(e.Dom._getAttribute(Y,f)===""){G=(Y.hasAttribute&&Y.hasAttribute(E))?E:f;Y.removeAttribute(G);}}}else{}return W;},replaceClass:function(X,W,G){return e.Dom.batch(X,e.Dom._replaceClass,{from:W,to:G});},_replaceClass:function(Y,X){var W,ab,aa,G=false,Z;if(Y&&X){ab=X.from;aa=X.to;if(!aa){G=false;}else{if(!ab){G=e.Dom._addClass(Y,X.to);}else{if(ab!==aa){Z=e.Dom._getAttribute(Y,f)||i;W=(b+Z.replace(e.Dom._getClassRegex(ab),b+aa).replace(/\s+/g,b)).split(e.Dom._getClassRegex(aa));W.splice(1,0,b+aa);e.Dom.setAttribute(Y,f,a(W.join(i)));G=true;}}}}else{}return G;},generateId:function(G,X){X=X||"yui-gen";var W=function(Y){if(Y&&Y.id){return Y.id;}var Z=X+YAHOO.env._id_counter++;
-if(Y){if(Y[C]&&Y[C].getElementById(Z)){return e.Dom.generateId(Y,Z+X);}Y.id=Z;}return Z;};return e.Dom.batch(G,W,e.Dom,true)||W.apply(e.Dom,arguments);},isAncestor:function(W,X){W=e.Dom.get(W);X=e.Dom.get(X);var G=false;if((W&&X)&&(W[K]&&X[K])){if(W.contains&&W!==X){G=W.contains(X);}else{if(W.compareDocumentPosition){G=!!(W.compareDocumentPosition(X)&16);}}}else{}return G;},inDocument:function(G,W){return e.Dom._inDoc(e.Dom.get(G),W);},_inDoc:function(W,X){var G=false;if(W&&W[c]){X=X||W[C];G=e.Dom.isAncestor(X[U],W);}else{}return G;},getElementsBy:function(W,af,ab,ad,X,ac,ae){af=af||"*";ab=(ab)?e.Dom.get(ab):null||j;var aa=(ae)?null:[],G;if(ab){G=ab.getElementsByTagName(af);for(var Y=0,Z=G.length;Y<Z;++Y){if(W(G[Y])){if(ae){aa=G[Y];break;}else{aa[aa.length]=G[Y];}}}if(ad){e.Dom.batch(aa,ad,X,ac);}}return aa;},getElementBy:function(X,G,W){return e.Dom.getElementsBy(X,G,W,null,null,null,true);},batch:function(X,ab,aa,Z){var Y=[],W=(Z)?aa:null;X=(X&&(X[c]||X.item))?X:e.Dom.get(X);if(X&&ab){if(X[c]||X.length===undefined){return ab.call(W,X,aa);}for(var G=0;G<X.length;++G){Y[Y.length]=ab.call(W||X[G],X[G],aa);}}else{return false;}return Y;},getDocumentHeight:function(){var W=(j[S]!=l||h)?j.body.scrollHeight:v.scrollHeight,G=Math.max(W,e.Dom.getViewportHeight());return G;},getDocumentWidth:function(){var W=(j[S]!=l||h)?j.body.scrollWidth:v.scrollWidth,G=Math.max(W,e.Dom.getViewportWidth());return G;},getViewportHeight:function(){var G=self.innerHeight,W=j[S];if((W||s)&&!d){G=(W==l)?v.clientHeight:j.body.clientHeight;}return G;},getViewportWidth:function(){var G=self.innerWidth,W=j[S];if(W||s){G=(W==l)?v.clientWidth:j.body.clientWidth;}return G;},getAncestorBy:function(G,W){while((G=G[x])){if(e.Dom._testElement(G,W)){return G;}}return null;},getAncestorByClassName:function(W,G){W=e.Dom.get(W);if(!W){return null;}var X=function(Y){return e.Dom.hasClass(Y,G);};return e.Dom.getAncestorBy(W,X);},getAncestorByTagName:function(W,G){W=e.Dom.get(W);if(!W){return null;}var X=function(Y){return Y[c]&&Y[c].toUpperCase()==G.toUpperCase();};return e.Dom.getAncestorBy(W,X);},getPreviousSiblingBy:function(G,W){while(G){G=G.previousSibling;if(e.Dom._testElement(G,W)){return G;}}return null;},getPreviousSibling:function(G){G=e.Dom.get(G);if(!G){return null;}return e.Dom.getPreviousSiblingBy(G);},getNextSiblingBy:function(G,W){while(G){G=G.nextSibling;if(e.Dom._testElement(G,W)){return G;}}return null;},getNextSibling:function(G){G=e.Dom.get(G);if(!G){return null;}return e.Dom.getNextSiblingBy(G);},getFirstChildBy:function(G,X){var W=(e.Dom._testElement(G.firstChild,X))?G.firstChild:null;return W||e.Dom.getNextSiblingBy(G.firstChild,X);},getFirstChild:function(G,W){G=e.Dom.get(G);if(!G){return null;}return e.Dom.getFirstChildBy(G);},getLastChildBy:function(G,X){if(!G){return null;}var W=(e.Dom._testElement(G.lastChild,X))?G.lastChild:null;return W||e.Dom.getPreviousSiblingBy(G.lastChild,X);},getLastChild:function(G){G=e.Dom.get(G);return e.Dom.getLastChildBy(G);},getChildrenBy:function(W,Y){var X=e.Dom.getFirstChildBy(W,Y),G=X?[X]:[];e.Dom.getNextSiblingBy(X,function(Z){if(!Y||Y(Z)){G[G.length]=Z;}return false;});return G;},getChildren:function(G){G=e.Dom.get(G);if(!G){}return e.Dom.getChildrenBy(G);},getDocumentScrollLeft:function(G){G=G||j;return Math.max(G[U].scrollLeft,G.body.scrollLeft);},getDocumentScrollTop:function(G){G=G||j;return Math.max(G[U].scrollTop,G.body.scrollTop);},insertBefore:function(W,G){W=e.Dom.get(W);G=e.Dom.get(G);if(!W||!G||!G[x]){return null;}return G[x].insertBefore(W,G);},insertAfter:function(W,G){W=e.Dom.get(W);G=e.Dom.get(G);if(!W||!G||!G[x]){return null;}if(G.nextSibling){return G[x].insertBefore(W,G.nextSibling);}else{return G[x].appendChild(W);}},getClientRegion:function(){var X=e.Dom.getDocumentScrollTop(),W=e.Dom.getDocumentScrollLeft(),Y=e.Dom.getViewportWidth()+W,G=e.Dom.getViewportHeight()+X;return new e.Region(X,Y,G,W);},setAttribute:function(W,G,X){e.Dom.batch(W,e.Dom._setAttribute,{attr:G,val:X});},_setAttribute:function(X,W){var G=e.Dom._toCamel(W.attr),Y=W.val;if(X&&X.setAttribute){if(e.Dom.DOT_ATTRIBUTES[G]&&X.tagName&&X.tagName!="BUTTON"){X[G]=Y;}else{G=e.Dom.CUSTOM_ATTRIBUTES[G]||G;X.setAttribute(G,Y);}}else{}},getAttribute:function(W,G){return e.Dom.batch(W,e.Dom._getAttribute,G);},_getAttribute:function(W,G){var X;G=e.Dom.CUSTOM_ATTRIBUTES[G]||G;if(e.Dom.DOT_ATTRIBUTES[G]){X=W[G];}else{if(W&&"getAttribute" in W){if(/^(?:href|src)$/.test(G)){X=W.getAttribute(G,2);}else{X=W.getAttribute(G);}}else{}}return X;},_toCamel:function(W){var X=B;function G(Y,Z){return Z.toUpperCase();}return X[W]||(X[W]=W.indexOf("-")===-1?W:W.replace(/-([a-z])/gi,G));},_getClassRegex:function(W){var G;if(W!==undefined){if(W.exec){G=W;}else{G=F[W];if(!G){W=W.replace(e.Dom._patterns.CLASS_RE_TOKENS,"\\$1");W=W.replace(/\s+/g,b);G=F[W]=new RegExp(R+W+J,t);}}}return G;},_patterns:{ROOT_TAG:/^body|html$/i,CLASS_RE_TOKENS:/([\.\(\)\^\$\*\+\?\|\[\]\{\}\\])/g},_testElement:function(G,W){return G&&G[K]==1&&(!W||W(G));},_calcBorders:function(X,Y){var W=parseInt(e.Dom[V](X,q),10)||0,G=parseInt(e.Dom[V](X,P),10)||0;if(g){if(m.test(X[c])){W=0;G=0;}}Y[0]+=G;Y[1]+=W;return Y;}};var r=e.Dom[V];if(L.opera){e.Dom[V]=function(W,G){var X=r(W,G);if(w.test(G)){X=e.Dom.Color.toRGB(X);}return X;};}if(L.webkit){e.Dom[V]=function(W,G){var X=r(W,G);if(X==="rgba(0, 0, 0, 0)"){X="transparent";}return X;};}if(L.ie&&L.ie>=8){e.Dom.DOT_ATTRIBUTES.type=true;}})();YAHOO.util.Region=function(d,e,a,c){this.top=d;this.y=d;this[1]=d;this.right=e;this.bottom=a;this.left=c;this.x=c;this[0]=c;this.width=this.right-this.left;this.height=this.bottom-this.top;};YAHOO.util.Region.prototype.contains=function(a){return(a.left>=this.left&&a.right<=this.right&&a.top>=this.top&&a.bottom<=this.bottom);};YAHOO.util.Region.prototype.getArea=function(){return((this.bottom-this.top)*(this.right-this.left));};YAHOO.util.Region.prototype.intersect=function(f){var d=Math.max(this.top,f.top),e=Math.min(this.right,f.right),a=Math.min(this.bottom,f.bottom),c=Math.max(this.left,f.left);
-if(a>=d&&e>=c){return new YAHOO.util.Region(d,e,a,c);}else{return null;}};YAHOO.util.Region.prototype.union=function(f){var d=Math.min(this.top,f.top),e=Math.max(this.right,f.right),a=Math.max(this.bottom,f.bottom),c=Math.min(this.left,f.left);return new YAHOO.util.Region(d,e,a,c);};YAHOO.util.Region.prototype.toString=function(){return("Region {"+"top: "+this.top+", right: "+this.right+", bottom: "+this.bottom+", left: "+this.left+", height: "+this.height+", width: "+this.width+"}");};YAHOO.util.Region.getRegion=function(e){var g=YAHOO.util.Dom.getXY(e),d=g[1],f=g[0]+e.offsetWidth,a=g[1]+e.offsetHeight,c=g[0];return new YAHOO.util.Region(d,f,a,c);};YAHOO.util.Point=function(a,b){if(YAHOO.lang.isArray(a)){b=a[1];a=a[0];}YAHOO.util.Point.superclass.constructor.call(this,b,a,b,a);};YAHOO.extend(YAHOO.util.Point,YAHOO.util.Region);(function(){var b=YAHOO.util,a="clientTop",f="clientLeft",j="parentNode",k="right",w="hasLayout",i="px",u="opacity",l="auto",d="borderLeftWidth",g="borderTopWidth",p="borderRightWidth",v="borderBottomWidth",s="visible",q="transparent",n="height",e="width",h="style",t="currentStyle",r=/^width|height$/,o=/^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz|%){1}?/i,m={get:function(x,z){var y="",A=x[t][z];if(z===u){y=b.Dom.getStyle(x,u);}else{if(!A||(A.indexOf&&A.indexOf(i)>-1)){y=A;}else{if(b.Dom.IE_COMPUTED[z]){y=b.Dom.IE_COMPUTED[z](x,z);}else{if(o.test(A)){y=b.Dom.IE.ComputedStyle.getPixel(x,z);}else{y=A;}}}}return y;},getOffset:function(z,E){var B=z[t][E],x=E.charAt(0).toUpperCase()+E.substr(1),C="offset"+x,y="pixel"+x,A="",D;if(B==l){D=z[C];if(D===undefined){A=0;}A=D;if(r.test(E)){z[h][E]=D;if(z[C]>D){A=D-(z[C]-D);}z[h][E]=l;}}else{if(!z[h][y]&&!z[h][E]){z[h][E]=B;}A=z[h][y];}return A+i;},getBorderWidth:function(x,z){var y=null;if(!x[t][w]){x[h].zoom=1;}switch(z){case g:y=x[a];break;case v:y=x.offsetHeight-x.clientHeight-x[a];break;case d:y=x[f];break;case p:y=x.offsetWidth-x.clientWidth-x[f];break;}return y+i;},getPixel:function(y,x){var A=null,B=y[t][k],z=y[t][x];y[h][k]=z;A=y[h].pixelRight;y[h][k]=B;return A+i;},getMargin:function(y,x){var z;if(y[t][x]==l){z=0+i;}else{z=b.Dom.IE.ComputedStyle.getPixel(y,x);}return z;},getVisibility:function(y,x){var z;while((z=y[t])&&z[x]=="inherit"){y=y[j];}return(z)?z[x]:s;},getColor:function(y,x){return b.Dom.Color.toRGB(y[t][x])||q;},getBorderColor:function(y,x){var z=y[t],A=z[x]||z.color;return b.Dom.Color.toRGB(b.Dom.Color.toHex(A));}},c={};c.top=c.right=c.bottom=c.left=c[e]=c[n]=m.getOffset;c.color=m.getColor;c[g]=c[p]=c[v]=c[d]=m.getBorderWidth;c.marginTop=c.marginRight=c.marginBottom=c.marginLeft=m.getMargin;c.visibility=m.getVisibility;c.borderColor=c.borderTopColor=c.borderRightColor=c.borderBottomColor=c.borderLeftColor=m.getBorderColor;b.Dom.IE_COMPUTED=c;b.Dom.IE_ComputedStyle=m;})();(function(){var c="toString",a=parseInt,b=RegExp,d=YAHOO.util;d.Dom.Color={KEYWORDS:{black:"000",silver:"c0c0c0",gray:"808080",white:"fff",maroon:"800000",red:"f00",purple:"800080",fuchsia:"f0f",green:"008000",lime:"0f0",olive:"808000",yellow:"ff0",navy:"000080",blue:"00f",teal:"008080",aqua:"0ff"},re_RGB:/^rgb\(([0-9]+)\s*,\s*([0-9]+)\s*,\s*([0-9]+)\)$/i,re_hex:/^#?([0-9A-F]{2})([0-9A-F]{2})([0-9A-F]{2})$/i,re_hex3:/([0-9A-F])/gi,toRGB:function(e){if(!d.Dom.Color.re_RGB.test(e)){e=d.Dom.Color.toHex(e);}if(d.Dom.Color.re_hex.exec(e)){e="rgb("+[a(b.$1,16),a(b.$2,16),a(b.$3,16)].join(", ")+")";}return e;},toHex:function(f){f=d.Dom.Color.KEYWORDS[f]||f;if(d.Dom.Color.re_RGB.exec(f)){f=[Number(b.$1).toString(16),Number(b.$2).toString(16),Number(b.$3).toString(16)];for(var e=0;e<f.length;e++){if(f[e].length<2){f[e]="0"+f[e];}}f=f.join("");}if(f.length<6){f=f.replace(d.Dom.Color.re_hex3,"$1$1");}if(f!=="transparent"&&f.indexOf("#")<0){f="#"+f;}return f.toUpperCase();}};}());YAHOO.register("dom",YAHOO.util.Dom,{version:"2.9.0",build:"2800"});YAHOO.util.CustomEvent=function(d,c,b,a,e){this.type=d;this.scope=c||window;this.silent=b;this.fireOnce=e;this.fired=false;this.firedWith=null;this.signature=a||YAHOO.util.CustomEvent.LIST;this.subscribers=[];if(!this.silent){}var f="_YUICEOnSubscribe";if(d!==f){this.subscribeEvent=new YAHOO.util.CustomEvent(f,this,true);}this.lastError=null;};YAHOO.util.CustomEvent.LIST=0;YAHOO.util.CustomEvent.FLAT=1;YAHOO.util.CustomEvent.prototype={subscribe:function(b,c,d){if(!b){throw new Error("Invalid callback for subscriber to '"+this.type+"'");}if(this.subscribeEvent){this.subscribeEvent.fire(b,c,d);}var a=new YAHOO.util.Subscriber(b,c,d);if(this.fireOnce&&this.fired){this.notify(a,this.firedWith);}else{this.subscribers.push(a);}},unsubscribe:function(d,f){if(!d){return this.unsubscribeAll();}var e=false;for(var b=0,a=this.subscribers.length;b<a;++b){var c=this.subscribers[b];if(c&&c.contains(d,f)){this._delete(b);e=true;}}return e;},fire:function(){this.lastError=null;var h=[],a=this.subscribers.length;var d=[].slice.call(arguments,0),c=true,f,b=false;if(this.fireOnce){if(this.fired){return true;}else{this.firedWith=d;}}this.fired=true;if(!a&&this.silent){return true;}if(!this.silent){}var e=this.subscribers.slice();for(f=0;f<a;++f){var g=e[f];if(!g||!g.fn){b=true;}else{c=this.notify(g,d);if(false===c){if(!this.silent){}break;}}}return(c!==false);},notify:function(g,c){var b,i=null,f=g.getScope(this.scope),a=YAHOO.util.Event.throwErrors;if(!this.silent){}if(this.signature==YAHOO.util.CustomEvent.FLAT){if(c.length>0){i=c[0];}try{b=g.fn.call(f,i,g.obj);}catch(h){this.lastError=h;if(a){throw h;}}}else{try{b=g.fn.call(f,this.type,c,g.obj);}catch(d){this.lastError=d;if(a){throw d;}}}return b;},unsubscribeAll:function(){var a=this.subscribers.length,b;for(b=a-1;b>-1;b--){this._delete(b);}this.subscribers=[];return a;},_delete:function(a){var b=this.subscribers[a];if(b){delete b.fn;delete b.obj;}this.subscribers.splice(a,1);},toString:function(){return"CustomEvent: "+"'"+this.type+"', "+"context: "+this.scope;}};YAHOO.util.Subscriber=function(a,b,c){this.fn=a;this.obj=YAHOO.lang.isUndefined(b)?null:b;this.overrideContext=c;};YAHOO.util.Subscriber.prototype.getScope=function(a){if(this.overrideContext){if(this.overrideContext===true){return this.obj;}else{return this.overrideContext;}}return a;};YAHOO.util.Subscriber.prototype.contains=function(a,b){if(b){return(this.fn==a&&this.obj==b);}else{return(this.fn==a);}};YAHOO.util.Subscriber.prototype.toString=function(){return"Subscriber { obj: "+this.obj+", overrideContext: "+(this.overrideContext||"no")+" }";};if(!YAHOO.util.Event){YAHOO.util.Event=function(){var g=false,h=[],j=[],a=0,e=[],b=0,c={63232:38,63233:40,63234:37,63235:39,63276:33,63277:34,25:9},d=YAHOO.env.ua.ie,f="focusin",i="focusout";return{POLL_RETRYS:500,POLL_INTERVAL:40,EL:0,TYPE:1,FN:2,WFN:3,UNLOAD_OBJ:3,ADJ_SCOPE:4,OBJ:5,OVERRIDE:6,CAPTURE:7,lastError:null,isSafari:YAHOO.env.ua.webkit,webkit:YAHOO.env.ua.webkit,isIE:d,_interval:null,_dri:null,_specialTypes:{focusin:(d?"focusin":"focus"),focusout:(d?"focusout":"blur")},DOMReady:false,throwErrors:false,startInterval:function(){if(!this._interval){this._interval=YAHOO.lang.later(this.POLL_INTERVAL,this,this._tryPreloadAttach,null,true);}},onAvailable:function(q,m,o,p,n){var k=(YAHOO.lang.isString(q))?[q]:q;for(var l=0;l<k.length;l=l+1){e.push({id:k[l],fn:m,obj:o,overrideContext:p,checkReady:n});}a=this.POLL_RETRYS;this.startInterval();},onContentReady:function(n,k,l,m){this.onAvailable(n,k,l,m,true);},onDOMReady:function(){this.DOMReadyEvent.subscribe.apply(this.DOMReadyEvent,arguments);},_addListener:function(m,k,v,p,t,y){if(!v||!v.call){return false;}if(this._isValidCollection(m)){var w=true;for(var q=0,s=m.length;q<s;++q){w=this.on(m[q],k,v,p,t)&&w;}return w;}else{if(YAHOO.lang.isString(m)){var o=this.getEl(m);if(o){m=o;}else{this.onAvailable(m,function(){YAHOO.util.Event._addListener(m,k,v,p,t,y);});return true;}}}if(!m){return false;}if("unload"==k&&p!==this){j[j.length]=[m,k,v,p,t];return true;}var l=m;if(t){if(t===true){l=p;}else{l=t;}}var n=function(z){return v.call(l,YAHOO.util.Event.getEvent(z,m),p);};var x=[m,k,v,n,l,p,t,y];var r=h.length;h[r]=x;try{this._simpleAdd(m,k,n,y);}catch(u){this.lastError=u;this.removeListener(m,k,v);return false;}return true;},_getType:function(k){return this._specialTypes[k]||k;},addListener:function(m,p,l,n,o){var k=((p==f||p==i)&&!YAHOO.env.ua.ie)?true:false;return this._addListener(m,this._getType(p),l,n,o,k);},addFocusListener:function(l,k,m,n){return this.on(l,f,k,m,n);},removeFocusListener:function(l,k){return this.removeListener(l,f,k);},addBlurListener:function(l,k,m,n){return this.on(l,i,k,m,n);},removeBlurListener:function(l,k){return this.removeListener(l,i,k);},removeListener:function(l,k,r){var m,p,u;k=this._getType(k);if(typeof l=="string"){l=this.getEl(l);}else{if(this._isValidCollection(l)){var s=true;for(m=l.length-1;m>-1;m--){s=(this.removeListener(l[m],k,r)&&s);}return s;}}if(!r||!r.call){return this.purgeElement(l,false,k);}if("unload"==k){for(m=j.length-1;m>-1;m--){u=j[m];if(u&&u[0]==l&&u[1]==k&&u[2]==r){j.splice(m,1);return true;}}return false;}var n=null;var o=arguments[3];if("undefined"===typeof o){o=this._getCacheIndex(h,l,k,r);}if(o>=0){n=h[o];}if(!l||!n){return false;}var t=n[this.CAPTURE]===true?true:false;try{this._simpleRemove(l,k,n[this.WFN],t);}catch(q){this.lastError=q;return false;}delete h[o][this.WFN];delete h[o][this.FN];h.splice(o,1);return true;},getTarget:function(m,l){var k=m.target||m.srcElement;return this.resolveTextNode(k);},resolveTextNode:function(l){try{if(l&&3==l.nodeType){return l.parentNode;}}catch(k){return null;}return l;},getPageX:function(l){var k=l.pageX;if(!k&&0!==k){k=l.clientX||0;if(this.isIE){k+=this._getScrollLeft();}}return k;},getPageY:function(k){var l=k.pageY;if(!l&&0!==l){l=k.clientY||0;if(this.isIE){l+=this._getScrollTop();}}return l;},getXY:function(k){return[this.getPageX(k),this.getPageY(k)];},getRelatedTarget:function(l){var k=l.relatedTarget;
-if(!k){if(l.type=="mouseout"){k=l.toElement;}else{if(l.type=="mouseover"){k=l.fromElement;}}}return this.resolveTextNode(k);},getTime:function(m){if(!m.time){var l=new Date().getTime();try{m.time=l;}catch(k){this.lastError=k;return l;}}return m.time;},stopEvent:function(k){this.stopPropagation(k);this.preventDefault(k);},stopPropagation:function(k){if(k.stopPropagation){k.stopPropagation();}else{k.cancelBubble=true;}},preventDefault:function(k){if(k.preventDefault){k.preventDefault();}else{k.returnValue=false;}},getEvent:function(m,k){var l=m||window.event;if(!l){var n=this.getEvent.caller;while(n){l=n.arguments[0];if(l&&Event==l.constructor){break;}n=n.caller;}}return l;},getCharCode:function(l){var k=l.keyCode||l.charCode||0;if(YAHOO.env.ua.webkit&&(k in c)){k=c[k];}return k;},_getCacheIndex:function(n,q,r,p){for(var o=0,m=n.length;o<m;o=o+1){var k=n[o];if(k&&k[this.FN]==p&&k[this.EL]==q&&k[this.TYPE]==r){return o;}}return -1;},generateId:function(k){var l=k.id;if(!l){l="yuievtautoid-"+b;++b;k.id=l;}return l;},_isValidCollection:function(l){try{return(l&&typeof l!=="string"&&l.length&&!l.tagName&&!l.alert&&typeof l[0]!=="undefined");}catch(k){return false;}},elCache:{},getEl:function(k){return(typeof k==="string")?document.getElementById(k):k;},clearCache:function(){},DOMReadyEvent:new YAHOO.util.CustomEvent("DOMReady",YAHOO,0,0,1),_load:function(l){if(!g){g=true;var k=YAHOO.util.Event;k._ready();k._tryPreloadAttach();}},_ready:function(l){var k=YAHOO.util.Event;if(!k.DOMReady){k.DOMReady=true;k.DOMReadyEvent.fire();k._simpleRemove(document,"DOMContentLoaded",k._ready);}},_tryPreloadAttach:function(){if(e.length===0){a=0;if(this._interval){this._interval.cancel();this._interval=null;}return;}if(this.locked){return;}if(this.isIE){if(!this.DOMReady){this.startInterval();return;}}this.locked=true;var q=!g;if(!q){q=(a>0&&e.length>0);}var p=[];var r=function(t,u){var s=t;if(u.overrideContext){if(u.overrideContext===true){s=u.obj;}else{s=u.overrideContext;}}u.fn.call(s,u.obj);};var l,k,o,n,m=[];for(l=0,k=e.length;l<k;l=l+1){o=e[l];if(o){n=this.getEl(o.id);if(n){if(o.checkReady){if(g||n.nextSibling||!q){m.push(o);e[l]=null;}}else{r(n,o);e[l]=null;}}else{p.push(o);}}}for(l=0,k=m.length;l<k;l=l+1){o=m[l];r(this.getEl(o.id),o);}a--;if(q){for(l=e.length-1;l>-1;l--){o=e[l];if(!o||!o.id){e.splice(l,1);}}this.startInterval();}else{if(this._interval){this._interval.cancel();this._interval=null;}}this.locked=false;},purgeElement:function(p,q,s){var n=(YAHOO.lang.isString(p))?this.getEl(p):p;var r=this.getListeners(n,s),o,k;if(r){for(o=r.length-1;o>-1;o--){var m=r[o];this.removeListener(n,m.type,m.fn);}}if(q&&n&&n.childNodes){for(o=0,k=n.childNodes.length;o<k;++o){this.purgeElement(n.childNodes[o],q,s);}}},getListeners:function(n,k){var q=[],m;if(!k){m=[h,j];}else{if(k==="unload"){m=[j];}else{k=this._getType(k);m=[h];}}var s=(YAHOO.lang.isString(n))?this.getEl(n):n;for(var p=0;p<m.length;p=p+1){var u=m[p];if(u){for(var r=0,t=u.length;r<t;++r){var o=u[r];if(o&&o[this.EL]===s&&(!k||k===o[this.TYPE])){q.push({type:o[this.TYPE],fn:o[this.FN],obj:o[this.OBJ],adjust:o[this.OVERRIDE],scope:o[this.ADJ_SCOPE],index:r});}}}}return(q.length)?q:null;},_unload:function(s){var m=YAHOO.util.Event,p,o,n,r,q,t=j.slice(),k;for(p=0,r=j.length;p<r;++p){n=t[p];if(n){try{k=window;if(n[m.ADJ_SCOPE]){if(n[m.ADJ_SCOPE]===true){k=n[m.UNLOAD_OBJ];}else{k=n[m.ADJ_SCOPE];}}n[m.FN].call(k,m.getEvent(s,n[m.EL]),n[m.UNLOAD_OBJ]);}catch(w){}t[p]=null;}}n=null;k=null;j=null;if(h){for(o=h.length-1;o>-1;o--){n=h[o];if(n){try{m.removeListener(n[m.EL],n[m.TYPE],n[m.FN],o);}catch(v){}}}n=null;}try{m._simpleRemove(window,"unload",m._unload);m._simpleRemove(window,"load",m._load);}catch(u){}},_getScrollLeft:function(){return this._getScroll()[1];},_getScrollTop:function(){return this._getScroll()[0];},_getScroll:function(){var k=document.documentElement,l=document.body;if(k&&(k.scrollTop||k.scrollLeft)){return[k.scrollTop,k.scrollLeft];}else{if(l){return[l.scrollTop,l.scrollLeft];}else{return[0,0];}}},regCE:function(){},_simpleAdd:function(){if(window.addEventListener){return function(m,n,l,k){m.addEventListener(n,l,(k));};}else{if(window.attachEvent){return function(m,n,l,k){m.attachEvent("on"+n,l);};}else{return function(){};}}}(),_simpleRemove:function(){if(window.removeEventListener){return function(m,n,l,k){m.removeEventListener(n,l,(k));};}else{if(window.detachEvent){return function(l,m,k){l.detachEvent("on"+m,k);};}else{return function(){};}}}()};}();(function(){var a=YAHOO.util.Event;a.on=a.addListener;a.onFocus=a.addFocusListener;a.onBlur=a.addBlurListener;
-/*! DOMReady: based on work by: Dean Edwards/John Resig/Matthias Miller/Diego Perini */
-if(a.isIE){if(self!==self.top){document.onreadystatechange=function(){if(document.readyState=="complete"){document.onreadystatechange=null;a._ready();}};}else{YAHOO.util.Event.onDOMReady(YAHOO.util.Event._tryPreloadAttach,YAHOO.util.Event,true);var b=document.createElement("p");a._dri=setInterval(function(){try{b.doScroll("left");clearInterval(a._dri);a._dri=null;a._ready();b=null;}catch(c){}},a.POLL_INTERVAL);}}else{if(a.webkit&&a.webkit<525){a._dri=setInterval(function(){var c=document.readyState;if("loaded"==c||"complete"==c){clearInterval(a._dri);a._dri=null;a._ready();}},a.POLL_INTERVAL);}else{a._simpleAdd(document,"DOMContentLoaded",a._ready);}}a._simpleAdd(window,"load",a._load);a._simpleAdd(window,"unload",a._unload);a._tryPreloadAttach();})();}YAHOO.util.EventProvider=function(){};YAHOO.util.EventProvider.prototype={__yui_events:null,__yui_subscribers:null,subscribe:function(a,c,f,e){this.__yui_events=this.__yui_events||{};var d=this.__yui_events[a];if(d){d.subscribe(c,f,e);}else{this.__yui_subscribers=this.__yui_subscribers||{};var b=this.__yui_subscribers;if(!b[a]){b[a]=[];}b[a].push({fn:c,obj:f,overrideContext:e});}},unsubscribe:function(c,e,g){this.__yui_events=this.__yui_events||{};var a=this.__yui_events;if(c){var f=a[c];if(f){return f.unsubscribe(e,g);}}else{var b=true;for(var d in a){if(YAHOO.lang.hasOwnProperty(a,d)){b=b&&a[d].unsubscribe(e,g);
-}}return b;}return false;},unsubscribeAll:function(a){return this.unsubscribe(a);},createEvent:function(b,g){this.__yui_events=this.__yui_events||{};var e=g||{},d=this.__yui_events,f;if(d[b]){}else{f=new YAHOO.util.CustomEvent(b,e.scope||this,e.silent,YAHOO.util.CustomEvent.FLAT,e.fireOnce);d[b]=f;if(e.onSubscribeCallback){f.subscribeEvent.subscribe(e.onSubscribeCallback);}this.__yui_subscribers=this.__yui_subscribers||{};var a=this.__yui_subscribers[b];if(a){for(var c=0;c<a.length;++c){f.subscribe(a[c].fn,a[c].obj,a[c].overrideContext);}}}return d[b];},fireEvent:function(b){this.__yui_events=this.__yui_events||{};var d=this.__yui_events[b];if(!d){return null;}var a=[];for(var c=1;c<arguments.length;++c){a.push(arguments[c]);}return d.fire.apply(d,a);},hasEvent:function(a){if(this.__yui_events){if(this.__yui_events[a]){return true;}}return false;}};(function(){var a=YAHOO.util.Event,c=YAHOO.lang;YAHOO.util.KeyListener=function(d,i,e,f){if(!d){}else{if(!i){}else{if(!e){}}}if(!f){f=YAHOO.util.KeyListener.KEYDOWN;}var g=new YAHOO.util.CustomEvent("keyPressed");this.enabledEvent=new YAHOO.util.CustomEvent("enabled");this.disabledEvent=new YAHOO.util.CustomEvent("disabled");if(c.isString(d)){d=document.getElementById(d);}if(c.isFunction(e)){g.subscribe(e);}else{g.subscribe(e.fn,e.scope,e.correctScope);}function h(o,n){if(!i.shift){i.shift=false;}if(!i.alt){i.alt=false;}if(!i.ctrl){i.ctrl=false;}if(o.shiftKey==i.shift&&o.altKey==i.alt&&o.ctrlKey==i.ctrl){var j,m=i.keys,l;if(YAHOO.lang.isArray(m)){for(var k=0;k<m.length;k++){j=m[k];l=a.getCharCode(o);if(j==l){g.fire(l,o);break;}}}else{l=a.getCharCode(o);if(m==l){g.fire(l,o);}}}}this.enable=function(){if(!this.enabled){a.on(d,f,h);this.enabledEvent.fire(i);}this.enabled=true;};this.disable=function(){if(this.enabled){a.removeListener(d,f,h);this.disabledEvent.fire(i);}this.enabled=false;};this.toString=function(){return"KeyListener ["+i.keys+"] "+d.tagName+(d.id?"["+d.id+"]":"");};};var b=YAHOO.util.KeyListener;b.KEYDOWN="keydown";b.KEYUP="keyup";b.KEY={ALT:18,BACK_SPACE:8,CAPS_LOCK:20,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,META:224,NUM_LOCK:144,PAGE_DOWN:34,PAGE_UP:33,PAUSE:19,PRINTSCREEN:44,RIGHT:39,SCROLL_LOCK:145,SHIFT:16,SPACE:32,TAB:9,UP:38};})();YAHOO.register("event",YAHOO.util.Event,{version:"2.9.0",build:"2800"});YAHOO.register("yahoo-dom-event", YAHOO, {version: "2.9.0", build: "2800"});
\ No newline at end of file
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yui_item.js b/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yui_item.js
deleted file mode 100755
index 862e3f2c..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/HTML/Renderer/Template/yui_item.js
+++ /dev/null
@@ -1,5 +0,0 @@
-        "panel{line}": {
-          "header": "{header}",
-          "body": "<ul>{tests}</ul>",
-          "footer": ""
-        },
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Node.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Node.php
deleted file mode 100755
index 83964894..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Node.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Base class for nodes in the code coverage information tree.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-abstract class PHP_CodeCoverage_Report_Node implements Countable
-{
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * @var string
-     */
-    protected $path;
-
-    /**
-     * @var array
-     */
-    protected $pathArray;
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node
-     */
-    protected $parent;
-
-    /**
-     * @var string
-     */
-    protected $id;
-
-    /**
-     * Constructor.
-     *
-     * @param string                       $name
-     * @param PHP_CodeCoverage_Report_Node $parent
-     */
-    public function __construct($name, PHP_CodeCoverage_Report_Node $parent = NULL)
-    {
-        if (substr($name, -1) == '/') {
-            $name = substr($name, 0, -1);
-        }
-
-        $this->name   = $name;
-        $this->parent = $parent;
-    }
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * @return string
-     */
-    public function getId()
-    {
-        if ($this->id === NULL) {
-            $parent = $this->getParent();
-
-            if ($parent === NULL) {
-                $this->id = 'index';
-            } else {
-                $parentId = $parent->getId();
-
-                if ($parentId == 'index') {
-                    $this->id = $this->name;
-                } else {
-                    $this->id = $parentId . '_' . $this->name;
-                }
-            }
-        }
-
-        return $this->id;
-    }
-
-    /**
-     * @return string
-     */
-    public function getPath()
-    {
-        if ($this->path === NULL) {
-            if ($this->parent === NULL) {
-                $this->path = $this->name;
-            } else {
-                $this->path = $this->parent->getPath() . '/' . $this->name;
-            }
-        }
-
-        return $this->path;
-    }
-
-    /**
-     * @return array
-     */
-    public function getPathAsArray()
-    {
-        if ($this->pathArray === NULL) {
-            if ($this->parent === NULL) {
-                $this->pathArray = array();
-            } else {
-                $this->pathArray = $this->parent->getPathAsArray();
-            }
-
-            $this->pathArray[] = $this;
-        }
-
-        return $this->pathArray;
-    }
-
-    /**
-     * @return PHP_CodeCoverage_Report_Node
-     */
-    public function getParent()
-    {
-        return $this->parent;
-    }
-
-    /**
-     * Returns the percentage of classes that has been tested.
-     *
-     * @param  boolean $asString
-     * @return integer
-     */
-    public function getTestedClassesPercent($asString = TRUE)
-    {
-        return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedClasses(),
-          $this->getNumClasses(),
-          $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of traits that has been tested.
-     *
-     * @param  boolean $asString
-     * @return integer
-     */
-    public function getTestedTraitsPercent($asString = TRUE)
-    {
-        return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedTraits(),
-          $this->getNumTraits(),
-          $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of methods that has been tested.
-     *
-     * @param  boolean $asString
-     * @return integer
-     */
-    public function getTestedMethodsPercent($asString = TRUE)
-    {
-        return PHP_CodeCoverage_Util::percent(
-          $this->getNumTestedMethods(),
-          $this->getNumMethods(),
-          $asString
-        );
-    }
-
-    /**
-     * Returns the percentage of executed lines.
-     *
-     * @param  boolean $asString
-     * @return integer
-     */
-    public function getLineExecutedPercent($asString = TRUE)
-    {
-        return PHP_CodeCoverage_Util::percent(
-          $this->getNumExecutedLines(),
-          $this->getNumExecutableLines(),
-          $asString
-        );
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    abstract public function getClasses();
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    abstract public function getTraits();
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    abstract public function getFunctions();
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    abstract public function getLinesOfCode();
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return integer
-     */
-    abstract public function getNumExecutableLines();
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return integer
-     */
-    abstract public function getNumExecutedLines();
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return integer
-     */
-    abstract public function getNumClasses();
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return integer
-     */
-    abstract public function getNumTestedClasses();
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return integer
-     */
-    abstract public function getNumTraits();
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return integer
-     */
-    abstract public function getNumTestedTraits();
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return integer
-     */
-    abstract public function getNumMethods();
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return integer
-     */
-    abstract public function getNumTestedMethods();
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return integer
-     */
-    abstract public function getNumFunctions();
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return integer
-     */
-    abstract public function getNumTestedFunctions();
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Directory.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Directory.php
deleted file mode 100755
index 2b577f92..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Directory.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Represents a directory in the code coverage information tree.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_Directory extends PHP_CodeCoverage_Report_Node implements IteratorAggregate
-{
-    /**
-     * @var PHP_CodeCoverage_Report_Node[]
-     */
-    protected $children = array();
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node_Directory[]
-     */
-    protected $directories = array();
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node_File[]
-     */
-    protected $files = array();
-
-    /**
-     * @var array
-     */
-    protected $classes;
-
-    /**
-     * @var array
-     */
-    protected $traits;
-
-    /**
-     * @var array
-     */
-    protected $functions;
-
-    /**
-     * @var array
-     */
-    protected $linesOfCode = NULL;
-
-    /**
-     * @var integer
-     */
-    protected $numFiles = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numExecutableLines = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numExecutedLines = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numClasses = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedClasses = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numTraits = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedTraits = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numMethods = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedMethods = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numFunctions = -1;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedFunctions = -1;
-
-    /**
-     * Returns the number of files in/under this node.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        if ($this->numFiles == -1) {
-            $this->numFiles = 0;
-
-            foreach ($this->children as $child) {
-                $this->numFiles += count($child);
-            }
-        }
-
-        return $this->numFiles;
-    }
-
-    /**
-     * Returns an iterator for this node.
-     *
-     * @return RecursiveIteratorIterator
-     */
-    public function getIterator()
-    {
-        return new RecursiveIteratorIterator(
-          new PHP_CodeCoverage_Report_Node_Iterator($this),
-          RecursiveIteratorIterator::SELF_FIRST
-        );
-    }
-
-    /**
-     * Adds a new directory.
-     *
-     * @param  string $name
-     * @return PHP_CodeCoverage_Report_Node_Directory
-     */
-    public function addDirectory($name)
-    {
-        $directory = new PHP_CodeCoverage_Report_Node_Directory($name, $this);
-
-        $this->children[]    = $directory;
-        $this->directories[] = &$this->children[count($this->children) - 1];
-
-        return $directory;
-    }
-
-    /**
-     * Adds a new file.
-     *
-     * @param  string  $name
-     * @param  array   $coverageData
-     * @param  array   $testData
-     * @param  boolean $cacheTokens
-     * @return PHP_CodeCoverage_Report_Node_File
-     * @throws PHP_CodeCoverage_Exception
-     */
-    public function addFile($name, array $coverageData, array $testData, $cacheTokens)
-    {
-        $file = new PHP_CodeCoverage_Report_Node_File(
-          $name, $this, $coverageData, $testData, $cacheTokens
-        );
-
-        $this->children[] = $file;
-        $this->files[]    = &$this->children[count($this->children) - 1];
-
-        $this->numExecutableLines = -1;
-        $this->numExecutedLines   = -1;
-
-        return $file;
-    }
-
-    /**
-     * Returns the directories in this directory.
-     *
-     * @return array
-     */
-    public function getDirectories()
-    {
-        return $this->directories;
-    }
-
-    /**
-     * Returns the files in this directory.
-     *
-     * @return array
-     */
-    public function getFiles()
-    {
-        return $this->files;
-    }
-
-    /**
-     * Returns the child nodes of this node.
-     *
-     * @return array
-     */
-    public function getChildNodes()
-    {
-        return $this->children;
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    public function getClasses()
-    {
-        if ($this->classes === NULL) {
-            $this->classes = array();
-
-            foreach ($this->children as $child) {
-                $this->classes = array_merge(
-                  $this->classes, $child->getClasses()
-                );
-            }
-        }
-
-        return $this->classes;
-    }
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    public function getTraits()
-    {
-        if ($this->traits === NULL) {
-            $this->traits = array();
-
-            foreach ($this->children as $child) {
-                $this->traits = array_merge(
-                  $this->traits, $child->getTraits()
-                );
-            }
-        }
-
-        return $this->traits;
-    }
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        if ($this->functions === NULL) {
-            $this->functions = array();
-
-            foreach ($this->children as $child) {
-                $this->functions = array_merge(
-                  $this->functions, $child->getFunctions()
-                );
-            }
-        }
-
-        return $this->functions;
-    }
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    public function getLinesOfCode()
-    {
-        if ($this->linesOfCode === NULL) {
-            $this->linesOfCode = array('loc' => 0, 'cloc' => 0, 'ncloc' => 0);
-
-            foreach ($this->children as $child) {
-                $linesOfCode = $child->getLinesOfCode();
-
-                $this->linesOfCode['loc']   += $linesOfCode['loc'];
-                $this->linesOfCode['cloc']  += $linesOfCode['cloc'];
-                $this->linesOfCode['ncloc'] += $linesOfCode['ncloc'];
-            }
-        }
-
-        return $this->linesOfCode;
-    }
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return integer
-     */
-    public function getNumExecutableLines()
-    {
-        if ($this->numExecutableLines == -1) {
-            $this->numExecutableLines = 0;
-
-            foreach ($this->children as $child) {
-                $this->numExecutableLines += $child->getNumExecutableLines();
-            }
-        }
-
-        return $this->numExecutableLines;
-    }
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return integer
-     */
-    public function getNumExecutedLines()
-    {
-        if ($this->numExecutedLines == -1) {
-            $this->numExecutedLines = 0;
-
-            foreach ($this->children as $child) {
-                $this->numExecutedLines += $child->getNumExecutedLines();
-            }
-        }
-
-        return $this->numExecutedLines;
-    }
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return integer
-     */
-    public function getNumClasses()
-    {
-        if ($this->numClasses == -1) {
-            $this->numClasses = 0;
-
-            foreach ($this->children as $child) {
-                $this->numClasses += $child->getNumClasses();
-            }
-        }
-
-        return $this->numClasses;
-    }
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return integer
-     */
-    public function getNumTestedClasses()
-    {
-        if ($this->numTestedClasses == -1) {
-            $this->numTestedClasses = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedClasses += $child->getNumTestedClasses();
-            }
-        }
-
-        return $this->numTestedClasses;
-    }
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return integer
-     */
-    public function getNumTraits()
-    {
-        if ($this->numTraits == -1) {
-            $this->numTraits = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTraits += $child->getNumTraits();
-            }
-        }
-
-        return $this->numTraits;
-    }
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return integer
-     */
-    public function getNumTestedTraits()
-    {
-        if ($this->numTestedTraits == -1) {
-            $this->numTestedTraits = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedTraits += $child->getNumTestedTraits();
-            }
-        }
-
-        return $this->numTestedTraits;
-    }
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return integer
-     */
-    public function getNumMethods()
-    {
-        if ($this->numMethods == -1) {
-            $this->numMethods = 0;
-
-            foreach ($this->children as $child) {
-                $this->numMethods += $child->getNumMethods();
-            }
-        }
-
-        return $this->numMethods;
-    }
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return integer
-     */
-    public function getNumTestedMethods()
-    {
-        if ($this->numTestedMethods == -1) {
-            $this->numTestedMethods = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedMethods += $child->getNumTestedMethods();
-            }
-        }
-
-        return $this->numTestedMethods;
-    }
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return integer
-     */
-    public function getNumFunctions()
-    {
-        if ($this->numFunctions == -1) {
-            $this->numFunctions = 0;
-
-            foreach ($this->children as $child) {
-                $this->numFunctions += $child->getNumFunctions();
-            }
-        }
-
-        return $this->numFunctions;
-    }
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return integer
-     */
-    public function getNumTestedFunctions()
-    {
-        if ($this->numTestedFunctions == -1) {
-            $this->numTestedFunctions = 0;
-
-            foreach ($this->children as $child) {
-                $this->numTestedFunctions += $child->getNumTestedFunctions();
-            }
-        }
-
-        return $this->numTestedFunctions;
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/File.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Node/File.php
deleted file mode 100755
index dd5172ee..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/File.php
+++ /dev/null
@@ -1,694 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Represents a file in the code coverage information tree.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_File extends PHP_CodeCoverage_Report_Node
-{
-    /**
-     * @var array
-     */
-    protected $coverageData;
-
-    /**
-     * @var array
-     */
-    protected $testData;
-
-    /**
-     * @var array
-     */
-    protected $ignoredLines;
-
-    /**
-     * @var integer
-     */
-    protected $numExecutableLines = 0;
-
-    /**
-     * @var integer
-     */
-    protected $numExecutedLines = 0;
-
-    /**
-     * @var array
-     */
-    protected $classes = array();
-
-    /**
-     * @var array
-     */
-    protected $traits = array();
-
-    /**
-     * @var array
-     */
-    protected $functions = array();
-
-    /**
-     * @var array
-     */
-    protected $linesOfCode = array();
-
-    /**
-     * @var integer
-     */
-    protected $numTestedTraits = 0;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedClasses = 0;
-
-    /**
-     * @var integer
-     */
-    protected $numMethods = NULL;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedMethods = NULL;
-
-    /**
-     * @var integer
-     */
-    protected $numTestedFunctions = NULL;
-
-    /**
-     * @var array
-     */
-    protected $startLines = array();
-
-    /**
-     * @var array
-     */
-    protected $endLines = array();
-
-    /**
-     * @var boolean
-     */
-    protected $cacheTokens;
-
-    /**
-     * Constructor.
-     *
-     * @param  string                       $name
-     * @param  PHP_CodeCoverage_Report_Node $parent
-     * @param  array                        $coverageData
-     * @param  array                        $testData
-     * @param  boolean                      $cacheTokens
-     */
-    public function __construct($name, PHP_CodeCoverage_Report_Node $parent, array $coverageData, array $testData, $cacheTokens)
-    {
-        if (!is_bool($cacheTokens)) {
-            throw new InvalidArgumentException;
-        }
-
-        parent::__construct($name, $parent);
-
-        $this->coverageData = $coverageData;
-        $this->testData     = $testData;
-        $this->ignoredLines = PHP_CodeCoverage_Util::getLinesToBeIgnored(
-                                $this->getPath(), $cacheTokens
-                              );
-        $this->cacheTokens  = $cacheTokens;
-
-        $this->calculateStatistics();
-    }
-
-    /**
-     * Returns the number of files in/under this node.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return 1;
-    }
-
-    /**
-     * Returns the code coverage data of this node.
-     *
-     * @return array
-     */
-    public function getCoverageData()
-    {
-        return $this->coverageData;
-    }
-
-    /**
-     * Returns the test data of this node.
-     *
-     * @return array
-     */
-    public function getTestData()
-    {
-        return $this->testData;
-    }
-
-    /**
-     * @return array
-     */
-    public function getIgnoredLines()
-    {
-        return $this->ignoredLines;
-    }
-
-    /**
-     * Returns the classes of this node.
-     *
-     * @return array
-     */
-    public function getClasses()
-    {
-        return $this->classes;
-    }
-
-    /**
-     * Returns the traits of this node.
-     *
-     * @return array
-     */
-    public function getTraits()
-    {
-        return $this->traits;
-    }
-
-    /**
-     * Returns the functions of this node.
-     *
-     * @return array
-     */
-    public function getFunctions()
-    {
-        return $this->functions;
-    }
-
-    /**
-     * Returns the LOC/CLOC/NCLOC of this node.
-     *
-     * @return array
-     */
-    public function getLinesOfCode()
-    {
-        return $this->linesOfCode;
-    }
-
-    /**
-     * Returns the number of executable lines.
-     *
-     * @return integer
-     */
-    public function getNumExecutableLines()
-    {
-        return $this->numExecutableLines;
-    }
-
-    /**
-     * Returns the number of executed lines.
-     *
-     * @return integer
-     */
-    public function getNumExecutedLines()
-    {
-        return $this->numExecutedLines;
-    }
-
-    /**
-     * Returns the number of classes.
-     *
-     * @return integer
-     */
-    public function getNumClasses()
-    {
-        return count($this->classes);
-    }
-
-    /**
-     * Returns the number of tested classes.
-     *
-     * @return integer
-     */
-    public function getNumTestedClasses()
-    {
-        return $this->numTestedClasses;
-    }
-
-    /**
-     * Returns the number of traits.
-     *
-     * @return integer
-     */
-    public function getNumTraits()
-    {
-        return count($this->traits);
-    }
-
-    /**
-     * Returns the number of tested traits.
-     *
-     * @return integer
-     */
-    public function getNumTestedTraits()
-    {
-        return $this->numTestedTraits;
-    }
-
-    /**
-     * Returns the number of methods.
-     *
-     * @return integer
-     */
-    public function getNumMethods()
-    {
-        if ($this->numMethods === NULL) {
-            $this->numMethods = 0;
-
-            foreach ($this->classes as $class) {
-                foreach ($class['methods'] as $method) {
-                    if ($method['executableLines'] > 0) {
-                        $this->numMethods++;
-                    }
-                }
-            }
-
-            foreach ($this->traits as $trait) {
-                foreach ($trait['methods'] as $method) {
-                    if ($method['executableLines'] > 0) {
-                        $this->numMethods++;
-                    }
-                }
-            }
-        }
-
-        return $this->numMethods;
-    }
-
-    /**
-     * Returns the number of tested methods.
-     *
-     * @return integer
-     */
-    public function getNumTestedMethods()
-    {
-        if ($this->numTestedMethods === NULL) {
-            $this->numTestedMethods = 0;
-
-            foreach ($this->classes as $class) {
-                foreach ($class['methods'] as $method) {
-                    if ($method['executableLines'] > 0 &&
-                        $method['coverage'] == 100) {
-                        $this->numTestedMethods++;
-                    }
-                }
-            }
-
-            foreach ($this->traits as $trait) {
-                foreach ($trait['methods'] as $method) {
-                    if ($method['executableLines'] > 0 &&
-                        $method['coverage'] == 100) {
-                        $this->numTestedMethods++;
-                    }
-                }
-            }
-        }
-
-        return $this->numTestedMethods;
-    }
-
-    /**
-     * Returns the number of functions.
-     *
-     * @return integer
-     */
-    public function getNumFunctions()
-    {
-        return count($this->functions);
-    }
-
-    /**
-     * Returns the number of tested functions.
-     *
-     * @return integer
-     */
-    public function getNumTestedFunctions()
-    {
-        if ($this->numTestedFunctions === NULL) {
-            $this->numTestedFunctions = 0;
-
-            foreach ($this->functions as $function) {
-                if ($function['executableLines'] > 0 &&
-                    $function['coverage'] == 100) {
-                    $this->numTestedFunctions++;
-                }
-            }
-        }
-
-        return $this->numTestedFunctions;
-    }
-
-    /**
-     * Calculates coverage statistics for the file.
-     */
-    protected function calculateStatistics()
-    {
-        if ($this->cacheTokens) {
-            $tokens = PHP_Token_Stream_CachingFactory::get($this->getPath());
-        } else {
-            $tokens = new PHP_Token_Stream($this->getPath());
-        }
-
-        $this->processClasses($tokens);
-        $this->processTraits($tokens);
-        $this->processFunctions($tokens);
-        $this->linesOfCode = $tokens->getLinesOfCode();
-        unset($tokens);
-
-        for ($lineNumber = 1; $lineNumber <= $this->linesOfCode['loc']; $lineNumber++) {
-            if (isset($this->startLines[$lineNumber])) {
-                // Start line of a class.
-                if (isset($this->startLines[$lineNumber]['className'])) {
-                    $currentClass = &$this->startLines[$lineNumber];
-                }
-
-                // Start line of a trait.
-                else if (isset($this->startLines[$lineNumber]['traitName'])) {
-                    $currentTrait = &$this->startLines[$lineNumber];
-                }
-
-                // Start line of a method.
-                else if (isset($this->startLines[$lineNumber]['methodName'])) {
-                    $currentMethod = &$this->startLines[$lineNumber];
-                }
-
-                // Start line of a function.
-                else if (isset($this->startLines[$lineNumber]['functionName'])) {
-                    $currentFunction = &$this->startLines[$lineNumber];
-                }
-            }
-
-            if (!isset($this->ignoredLines[$lineNumber]) &&
-                isset($this->coverageData[$lineNumber]) &&
-                $this->coverageData[$lineNumber] !== NULL) {
-                if (isset($currentClass)) {
-                    $currentClass['executableLines']++;
-                }
-
-                if (isset($currentTrait)) {
-                    $currentTrait['executableLines']++;
-                }
-
-                if (isset($currentMethod)) {
-                    $currentMethod['executableLines']++;
-                }
-
-                if (isset($currentFunction)) {
-                    $currentFunction['executableLines']++;
-                }
-
-                $this->numExecutableLines++;
-
-                if (count($this->coverageData[$lineNumber]) > 0 ||
-                    isset($this->ignoredLines[$lineNumber])) {
-                    if (isset($currentClass)) {
-                        $currentClass['executedLines']++;
-                    }
-
-                    if (isset($currentTrait)) {
-                        $currentTrait['executedLines']++;
-                    }
-
-                    if (isset($currentMethod)) {
-                        $currentMethod['executedLines']++;
-                    }
-
-                    if (isset($currentFunction)) {
-                        $currentFunction['executedLines']++;
-                    }
-
-                    $this->numExecutedLines++;
-                }
-            }
-
-            if (isset($this->endLines[$lineNumber])) {
-                // End line of a class.
-                if (isset($this->endLines[$lineNumber]['className'])) {
-                    unset($currentClass);
-                }
-
-                // End line of a trait.
-                else if (isset($this->endLines[$lineNumber]['traitName'])) {
-                    unset($currentTrait);
-                }
-
-                // End line of a method.
-                else if (isset($this->endLines[$lineNumber]['methodName'])) {
-                    unset($currentMethod);
-                }
-
-                // End line of a function.
-                else if (isset($this->endLines[$lineNumber]['functionName'])) {
-                    unset($currentFunction);
-                }
-            }
-        }
-
-        foreach ($this->traits as $traitName => &$trait) {
-            foreach ($trait['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                                           $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
-
-                $method['crap'] = PHP_CodeCoverage_Util::crap(
-                  $method['ccn'], $method['coverage']
-                );
-
-                $trait['ccn'] += $method['ccn'];
-            }
-
-            if ($trait['executableLines'] > 0) {
-                $trait['coverage'] = ($trait['executedLines'] /
-                                      $trait['executableLines']) * 100;
-            } else {
-                $trait['coverage'] = 100;
-            }
-
-            if ($trait['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
-            $trait['crap'] = PHP_CodeCoverage_Util::crap(
-              $trait['ccn'], $trait['coverage']
-            );
-        }
-
-        foreach ($this->classes as $className => &$class) {
-            foreach ($class['methods'] as &$method) {
-                if ($method['executableLines'] > 0) {
-                    $method['coverage'] = ($method['executedLines'] /
-                                           $method['executableLines']) * 100;
-                } else {
-                    $method['coverage'] = 100;
-                }
-
-                $method['crap'] = PHP_CodeCoverage_Util::crap(
-                  $method['ccn'], $method['coverage']
-                );
-
-                $class['ccn'] += $method['ccn'];
-            }
-
-            if ($class['executableLines'] > 0) {
-                $class['coverage'] = ($class['executedLines'] /
-                                      $class['executableLines']) * 100;
-            } else {
-                $class['coverage'] = 100;
-            }
-
-            if ($class['coverage'] == 100) {
-                $this->numTestedClasses++;
-            }
-
-            $class['crap'] = PHP_CodeCoverage_Util::crap(
-              $class['ccn'], $class['coverage']
-            );
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processClasses(PHP_Token_Stream $tokens)
-    {
-        $classes = $tokens->getClasses();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($classes as $className => $class) {
-            $this->classes[$className] = array(
-              'className'       => $className,
-              'methods'         => array(),
-              'startLine'       => $class['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => 0,
-              'coverage'        => 0,
-              'crap'            => 0,
-              'package'         => $class['package'],
-              'link'            => $link . $class['startLine']
-            );
-
-            $this->startLines[$class['startLine']] = &$this->classes[$className];
-            $this->endLines[$class['endLine']]     = &$this->classes[$className];
-
-            foreach ($class['methods'] as $methodName => $method) {
-                $this->classes[$className]['methods'][$methodName] = array(
-                  'methodName'      => $methodName,
-                  'signature'       => $method['signature'],
-                  'startLine'       => $method['startLine'],
-                  'endLine'         => $method['endLine'],
-                  'executableLines' => 0,
-                  'executedLines'   => 0,
-                  'ccn'             => $method['ccn'],
-                  'coverage'        => 0,
-                  'crap'            => 0,
-                  'link'            => $link . $method['startLine']
-                );
-
-                $this->startLines[$method['startLine']] = &$this->classes[$className]['methods'][$methodName];
-                $this->endLines[$method['endLine']]     = &$this->classes[$className]['methods'][$methodName];
-            }
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processTraits(PHP_Token_Stream $tokens)
-    {
-        $traits = $tokens->getTraits();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($traits as $traitName => $trait) {
-            $this->traits[$traitName] = array(
-              'traitName'       => $traitName,
-              'methods'         => array(),
-              'startLine'       => $trait['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => 0,
-              'coverage'        => 0,
-              'crap'            => 0,
-              'package'         => $trait['package'],
-              'link'            => $link . $trait['startLine']
-            );
-
-            $this->startLines[$trait['startLine']] = &$this->traits[$traitName];
-            $this->endLines[$trait['endLine']]     = &$this->traits[$traitName];
-
-            foreach ($trait['methods'] as $methodName => $method) {
-                $this->traits[$traitName]['methods'][$methodName] = array(
-                  'methodName'      => $methodName,
-                  'signature'       => $method['signature'],
-                  'startLine'       => $method['startLine'],
-                  'executableLines' => 0,
-                  'executedLines'   => 0,
-                  'ccn'             => $method['ccn'],
-                  'coverage'        => 0,
-                  'crap'            => 0,
-                  'link'            => $link . $method['startLine']
-                );
-
-                $this->startLines[$method['startLine']] = &$this->traits[$traitName]['methods'][$methodName];
-                $this->endLines[$method['endLine']]     = &$this->traits[$traitName]['methods'][$methodName];
-            }
-        }
-    }
-
-    /**
-     * @param PHP_Token_Stream $tokens
-     */
-    protected function processFunctions(PHP_Token_Stream $tokens)
-    {
-        $functions = $tokens->getFunctions();
-        unset($tokens);
-
-        $link = $this->getId() . '.html#';
-
-        foreach ($functions as $functionName => $function) {
-            $this->functions[$functionName] = array(
-              'functionName'    => $functionName,
-              'signature'       => $function['signature'],
-              'startLine'       => $function['startLine'],
-              'executableLines' => 0,
-              'executedLines'   => 0,
-              'ccn'             => $function['ccn'],
-              'coverage'        => 0,
-              'crap'            => 0,
-              'link'            => $link . $function['startLine']
-            );
-
-            $this->startLines[$function['startLine']] = &$this->functions[$functionName];
-            $this->endLines[$function['endLine']]     = &$this->functions[$functionName];
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Iterator.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Iterator.php
deleted file mode 100755
index e3e764bc..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Node/Iterator.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Recursive iterator for PHP_CodeCoverage_Report_Node object graphs.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Node_Iterator implements RecursiveIterator
-{
-    /**
-     * @var integer
-     */
-    protected $position;
-
-    /**
-     * @var PHP_CodeCoverage_Report_Node[]
-     */
-    protected $nodes;
-
-    /**
-     * Constructor.
-     *
-     * @param PHP_CodeCoverage_Report_Node_Directory $node
-     */
-    public function __construct(PHP_CodeCoverage_Report_Node_Directory $node)
-    {
-        $this->nodes = $node->getChildNodes();
-    }
-
-    /**
-     * Rewinds the Iterator to the first element.
-     *
-     */
-    public function rewind()
-    {
-        $this->position = 0;
-    }
-
-    /**
-     * Checks if there is a current element after calls to rewind() or next().
-     *
-     * @return boolean
-     */
-    public function valid()
-    {
-        return $this->position < count($this->nodes);
-    }
-
-    /**
-     * Returns the key of the current element.
-     *
-     * @return integer
-     */
-    public function key()
-    {
-        return $this->position;
-    }
-
-    /**
-     * Returns the current element.
-     *
-     * @return PHPUnit_Framework_Test
-     */
-    public function current()
-    {
-        return $this->valid() ? $this->nodes[$this->position] : NULL;
-    }
-
-    /**
-     * Moves forward to next element.
-     *
-     */
-    public function next()
-    {
-        $this->position++;
-    }
-
-    /**
-     * Returns the sub iterator for the current element.
-     *
-     * @return PHP_CodeCoverage_Report_Node_Iterator
-     */
-    public function getChildren()
-    {
-        return new PHP_CodeCoverage_Report_Node_Iterator(
-          $this->nodes[$this->position]
-        );
-    }
-
-    /**
-     * Checks whether the current element has children.
-     *
-     * @return boolean
-     */
-    public function hasChildren()
-    {
-        return $this->nodes[$this->position] instanceof PHP_CodeCoverage_Report_Node_Directory;
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/PHP.php b/tests/PHPUnit/PHP/CodeCoverage/Report/PHP.php
deleted file mode 100755
index aeab1d40..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/PHP.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Uses serialize() to write a PHP_CodeCoverage object to a file.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_PHP
-{
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $target = NULL)
-    {
-        $coverage = serialize($coverage);
-
-        if ($target !== NULL) {
-            return file_put_contents($target, $coverage);
-        } else {
-            return $coverage;
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHP/CodeCoverage/Report/Text.php b/tests/PHPUnit/PHP/CodeCoverage/Report/Text.php
deleted file mode 100755
index beafc52e..00000000
--- a/tests/PHPUnit/PHP/CodeCoverage/Report/Text.php
+++ /dev/null
@@ -1,286 +0,0 @@
-<?php
-/**
- * PHP_CodeCoverage
- *
- * Copyright (c) 2009-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Generates human readable output from an PHP_CodeCoverage object.
- *
- * The output gets put into a text file our written to the CLI.
- *
- * @category   PHP
- * @package    CodeCoverage
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2009-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.1
- * @link       http://github.com/sebastianbergmann/php-code-coverage
- * @since      Class available since Release 1.1.0
- */
-class PHP_CodeCoverage_Report_Text
-{
-    protected $outputStream;
-    protected $title;
-    protected $lowUpperBound;
-    protected $highLowerBound;
-    protected $showUncoveredFiles;
-
-    protected $colors = array(
-      'green'  => "\x1b[30;42m",
-      'yellow' => "\x1b[30;43m",
-      'red'    => "\x1b[37;41m",
-      'header' => "\x1b[47;40m",
-      'reset'  => "\x1b[0m",
-      'eol'    => "\x1b[2K",
-    );
-
-    public function __construct(PHPUnit_Util_Printer $outputStream, $title, $lowUpperBound, $highLowerBound, $showUncoveredFiles)
-    {
-        $this->outputStream       = $outputStream;
-        $this->title              = $title;
-        $this->lowUpperBound      = $lowUpperBound;
-        $this->highLowerBound     = $highLowerBound;
-        $this->showUncoveredFiles = $showUncoveredFiles;
-    }
-
-    /**
-     * @param  PHP_CodeCoverage $coverage
-     * @param  string           $target
-     * @param  string           $name
-     * @return string
-     */
-    public function process(PHP_CodeCoverage $coverage, $showColors = FALSE)
-    {
-        $output   = '';
-        $packages = array();
-        $report   = $coverage->getReport();
-        unset($coverage);
-
-        $colors = array(
-          'header'  => '',
-          'classes' => '',
-          'methods' => '',
-          'lines'   => '',
-          'reset'   => '',
-          'eol'     => ''
-        );
-
-        if ($showColors) {
-            $colors['classes'] = $this->getCoverageColor(
-                                   $report->getNumTestedClasses(),
-                                   $report->getNumClasses()
-                                 );
-            $colors['methods'] = $this->getCoverageColor(
-                                   $report->getNumTestedMethods(),
-                                   $report->getNumMethods()
-                                 );
-            $colors['lines']   = $this->getCoverageColor(
-                                   $report->getNumExecutedLines(),
-                                   $report->getNumExecutableLines()
-                                 );
-            $colors['reset']   = $this->colors['reset'];
-            $colors['header']  = $this->colors['header'];
-            $colors['eol']     = $this->colors['eol'];
-        }
-
-        $output .= PHP_EOL . PHP_EOL .
-                   $colors['header'] . 'Code Coverage Report ';
-
-        if ($this->title) {
-            $output .= 'for "' . $this->title . '"';
-        }
-
-        $output .= PHP_EOL .
-                   date('  Y-m-d H:i:s', $_SERVER['REQUEST_TIME']) .
-                   PHP_EOL;
-
-        $output .= PHP_EOL . ' Summary: ' . PHP_EOL . $colors['reset']
-          . $colors['classes'] . $colors['eol'] . '  Classes: ' . PHP_CodeCoverage_Util::percent($report->getNumTestedClasses(), $report->getNumClasses(), TRUE)
-          . ' (' . $report->getNumTestedClasses() . '/' . $report->getNumClasses() . ')' . PHP_EOL . $colors ['eol']
-          . $colors['methods'] . $colors['eol'] . '  Methods: ' . PHP_CodeCoverage_Util::percent($report->getNumTestedMethods(), $report->getNumMethods(), TRUE)
-          . ' (' . $report->getNumTestedMethods() . '/' . $report->getNumMethods() . ')' . PHP_EOL . $colors ['eol']
-          . $colors['lines'] . $colors['eol'] . '  Lines:   ' . PHP_CodeCoverage_Util::percent($report->getNumExecutedLines(), $report->getNumExecutableLines(), TRUE)
-          . ' (' . $report->getNumExecutedLines() . '/' . $report->getNumExecutableLines() . ')' . PHP_EOL . $colors['reset'] . $colors ['eol'];
-
-        $classCoverage = array();
-
-        foreach ($report as $item) {
-            if (!$item instanceof PHP_CodeCoverage_Report_Node_File) {
-                continue;
-            }
-
-            $classes      = array_merge($item->getClasses(), $item->getTraits());
-            $coverage     = $item->getCoverageData();
-            $lines        = array();
-            $ignoredLines = $item->getIgnoredLines();
-
-            foreach ($classes as $className => $class) {
-                $classStatements        = 0;
-                $coveredClassStatements = 0;
-                $coveredMethods         = 0;
-
-                foreach ($class['methods'] as $methodName => $method) {
-                    $methodCount        = 0;
-                    $methodLines        = 0;
-                    $methodLinesCovered = 0;
-
-                    for ($i  = $method['startLine'];
-                         $i <= $method['endLine'];
-                         $i++) {
-                        if (isset($ignoredLines[$i])) {
-                            continue;
-                        }
-
-                        $add   = TRUE;
-                        $count = 0;
-
-                        if (isset($coverage[$i])) {
-                            if ($coverage[$i] !== NULL) {
-                                $classStatements++;
-                                $methodLines++;
-                            } else {
-                                $add = FALSE;
-                            }
-
-                            $count = count($coverage[$i]);
-
-                            if ($count > 0) {
-                                $coveredClassStatements++;
-                                $methodLinesCovered++;
-                            }
-                        } else {
-                            $add = FALSE;
-                        }
-
-                        $methodCount = max($methodCount, $count);
-
-                        if ($add) {
-                            $lines[$i] = array(
-                              'count' => $count, 'type'  => 'stmt'
-                            );
-                        }
-                    }
-
-                    if ($methodCount > 0) {
-                        $coveredMethods++;
-                    }
-
-                }
-
-                if (!empty($class['package']['namespace'])) {
-                    $namespace = '\\' . $class['package']['namespace'] . '::';
-                }
-
-                else if (!empty($class['package']['fullPackage'])) {
-                    $namespace = '@' . $class['package']['fullPackage'] . '::';
-                }
-
-                else {
-                    $namespace = '';
-                }
-
-                $classCoverage[$namespace . $className] = array(
-                    'namespace'         => $namespace,
-                    'className '        => $className,
-                    'methodsCovered'    => $coveredMethods,
-                    'methodCount'       => count($class['methods']),
-                    'statementsCovered' => $coveredClassStatements,
-                    'statementCount'    => $classStatements,
-                );
-            }
-        }
-
-        ksort($classCoverage);
-
-        $methodColor = '';
-        $linesColor  = '';
-        $resetColor  = '';
-
-        foreach ($classCoverage as $fullQualifiedPath => $classInfo) {
-            if ($classInfo['statementsCovered'] != 0 ||
-                $this->showUncoveredFiles) {
-
-                if ($showColors) {
-                    $methodColor = $this->getCoverageColor($classInfo['methodsCovered'], $classInfo['methodCount']);
-                    $linesColor  = $this->getCoverageColor($classInfo['statementsCovered'], $classInfo['statementCount']);
-                    $resetColor  = $colors['reset'];
-                }
-
-                $output .= PHP_EOL . $fullQualifiedPath . PHP_EOL
-                  . '  ' . $methodColor . 'Methods: ' . $this->printCoverageCounts($classInfo['methodsCovered'], $classInfo['methodCount'], 2) . $resetColor . ' '
-                  . '  ' . $linesColor  . 'Lines: ' . $this->printCoverageCounts($classInfo['statementsCovered'], $classInfo['statementCount'], 3) . $resetColor
-                ;
-            }
-        }
-
-        $this->outputStream->write($output);
-    }
-
-    protected function getCoverageColor($numberOfCoveredElements, $totalNumberOfElements)
-    {
-        $coverage = PHP_CodeCoverage_Util::percent(
-          $numberOfCoveredElements, $totalNumberOfElements
-        );
-
-        if ($coverage > $this->highLowerBound) {
-            return $this->colors['green'];
-        }
-
-        else if ($coverage > $this->lowUpperBound) {
-            return $this->colors['yellow'];
-        }
-
-        return $this->colors['red'];
-    }
-
-    protected function printCoverageCounts($numberOfCoveredElements, $totalNumberOfElements, $presicion)
-    {
-        $format = '%' . $presicion . 's';
-
-        return PHP_CodeCoverage_Util::percent(
-          $numberOfCoveredElements, $totalNumberOfElements, TRUE, TRUE
-        ) .
-        ' (' . sprintf($format, $numberOfCoveredElements) . '/' .
-        sprintf($format, $totalNumberOfElements) . ')';
-    }
-}
diff --git a/tests/PHPUnit/PHP/Timer/Autoload.php b/tests/PHPUnit/PHP/Timer/Autoload.php
deleted file mode 100755
index 0e085b69..00000000
--- a/tests/PHPUnit/PHP/Timer/Autoload.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * PHP_Timer
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHP
- * @subpackage Timer
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/php-timer
- * @since      File available since Release 1.1.0
- */
-
-function php_timer_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
-
-    if ($classes === NULL) {
-        $classes = array(
-          'php_timer' => '/Timer.php'
-        );
-
-        $path = dirname(dirname(__FILE__));
-    }
-
-    if ($class === NULL) {
-        $result = array(__FILE__);
-
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        require $path . $classes[$cn];
-    }
-}
-
-spl_autoload_register('php_timer_autoload');
diff --git a/tests/PHPUnit/PHP/Token/Stream/Autoload.php b/tests/PHPUnit/PHP/Token/Stream/Autoload.php
deleted file mode 100755
index ec0558d4..00000000
--- a/tests/PHPUnit/PHP/Token/Stream/Autoload.php
+++ /dev/null
@@ -1,232 +0,0 @@
-<?php
-/**
- * php-token-stream
- *
- * Copyright (c) 2009-2010, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package   PHP_TokenStream
- * @author    Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright 2009-2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link      http://github.com/sebastianbergmann/php-token-stream/tree
- * @since     File available since Release 1.1.0
- */
-
-function php_tokenstream_autoload($class = NULL)
-{
-    static $classes = NULL;
-    static $path = NULL;;
-
-    if ($classes === NULL) {
-        $classes = array(
-          'php_token' => '/Token.php',
-          'php_token_abstract' => '/Token.php',
-          'php_token_ampersand' => '/Token.php',
-          'php_token_and_equal' => '/Token.php',
-          'php_token_array' => '/Token.php',
-          'php_token_array_cast' => '/Token.php',
-          'php_token_as' => '/Token.php',
-          'php_token_at' => '/Token.php',
-          'php_token_backtick' => '/Token.php',
-          'php_token_bad_character' => '/Token.php',
-          'php_token_bool_cast' => '/Token.php',
-          'php_token_boolean_and' => '/Token.php',
-          'php_token_boolean_or' => '/Token.php',
-          'php_token_break' => '/Token.php',
-          'php_token_caret' => '/Token.php',
-          'php_token_case' => '/Token.php',
-          'php_token_catch' => '/Token.php',
-          'php_token_character' => '/Token.php',
-          'php_token_class' => '/Token.php',
-          'php_token_class_c' => '/Token.php',
-          'php_token_clone' => '/Token.php',
-          'php_token_close_bracket' => '/Token.php',
-          'php_token_close_curly' => '/Token.php',
-          'php_token_close_square' => '/Token.php',
-          'php_token_close_tag' => '/Token.php',
-          'php_token_colon' => '/Token.php',
-          'php_token_comma' => '/Token.php',
-          'php_token_comment' => '/Token.php',
-          'php_token_concat_equal' => '/Token.php',
-          'php_token_const' => '/Token.php',
-          'php_token_constant_encapsed_string' => '/Token.php',
-          'php_token_continue' => '/Token.php',
-          'php_token_curly_open' => '/Token.php',
-          'php_token_dec' => '/Token.php',
-          'php_token_declare' => '/Token.php',
-          'php_token_default' => '/Token.php',
-          'php_token_dir' => '/Token.php',
-          'php_token_div' => '/Token.php',
-          'php_token_div_equal' => '/Token.php',
-          'php_token_dnumber' => '/Token.php',
-          'php_token_do' => '/Token.php',
-          'php_token_doc_comment' => '/Token.php',
-          'php_token_dollar' => '/Token.php',
-          'php_token_dollar_open_curly_braces' => '/Token.php',
-          'php_token_dot' => '/Token.php',
-          'php_token_double_arrow' => '/Token.php',
-          'php_token_double_cast' => '/Token.php',
-          'php_token_double_colon' => '/Token.php',
-          'php_token_double_quotes' => '/Token.php',
-          'php_token_echo' => '/Token.php',
-          'php_token_else' => '/Token.php',
-          'php_token_elseif' => '/Token.php',
-          'php_token_empty' => '/Token.php',
-          'php_token_encapsed_and_whitespace' => '/Token.php',
-          'php_token_end_heredoc' => '/Token.php',
-          'php_token_enddeclare' => '/Token.php',
-          'php_token_endfor' => '/Token.php',
-          'php_token_endforeach' => '/Token.php',
-          'php_token_endif' => '/Token.php',
-          'php_token_endswitch' => '/Token.php',
-          'php_token_endwhile' => '/Token.php',
-          'php_token_equal' => '/Token.php',
-          'php_token_eval' => '/Token.php',
-          'php_token_exclamation_mark' => '/Token.php',
-          'php_token_exit' => '/Token.php',
-          'php_token_extends' => '/Token.php',
-          'php_token_file' => '/Token.php',
-          'php_token_final' => '/Token.php',
-          'php_token_for' => '/Token.php',
-          'php_token_foreach' => '/Token.php',
-          'php_token_func_c' => '/Token.php',
-          'php_token_function' => '/Token.php',
-          'php_token_global' => '/Token.php',
-          'php_token_goto' => '/Token.php',
-          'php_token_gt' => '/Token.php',
-          'php_token_halt_compiler' => '/Token.php',
-          'php_token_if' => '/Token.php',
-          'php_token_implements' => '/Token.php',
-          'php_token_inc' => '/Token.php',
-          'php_token_include' => '/Token.php',
-          'php_token_include_once' => '/Token.php',
-          'php_token_includes' => '/Token.php',
-          'php_token_inline_html' => '/Token.php',
-          'php_token_instanceof' => '/Token.php',
-          'php_token_int_cast' => '/Token.php',
-          'php_token_interface' => '/Token.php',
-          'php_token_is_equal' => '/Token.php',
-          'php_token_is_greater_or_equal' => '/Token.php',
-          'php_token_is_identical' => '/Token.php',
-          'php_token_is_not_equal' => '/Token.php',
-          'php_token_is_not_identical' => '/Token.php',
-          'php_token_is_smaller_or_equal' => '/Token.php',
-          'php_token_isset' => '/Token.php',
-          'php_token_line' => '/Token.php',
-          'php_token_list' => '/Token.php',
-          'php_token_lnumber' => '/Token.php',
-          'php_token_logical_and' => '/Token.php',
-          'php_token_logical_or' => '/Token.php',
-          'php_token_logical_xor' => '/Token.php',
-          'php_token_lt' => '/Token.php',
-          'php_token_method_c' => '/Token.php',
-          'php_token_minus' => '/Token.php',
-          'php_token_minus_equal' => '/Token.php',
-          'php_token_mod_equal' => '/Token.php',
-          'php_token_mul_equal' => '/Token.php',
-          'php_token_mult' => '/Token.php',
-          'php_token_namespace' => '/Token.php',
-          'php_token_new' => '/Token.php',
-          'php_token_ns_c' => '/Token.php',
-          'php_token_ns_separator' => '/Token.php',
-          'php_token_num_string' => '/Token.php',
-          'php_token_object_cast' => '/Token.php',
-          'php_token_object_operator' => '/Token.php',
-          'php_token_open_bracket' => '/Token.php',
-          'php_token_open_curly' => '/Token.php',
-          'php_token_open_square' => '/Token.php',
-          'php_token_open_tag' => '/Token.php',
-          'php_token_open_tag_with_echo' => '/Token.php',
-          'php_token_or_equal' => '/Token.php',
-          'php_token_paamayim_nekudotayim' => '/Token.php',
-          'php_token_percent' => '/Token.php',
-          'php_token_pipe' => '/Token.php',
-          'php_token_plus' => '/Token.php',
-          'php_token_plus_equal' => '/Token.php',
-          'php_token_print' => '/Token.php',
-          'php_token_private' => '/Token.php',
-          'php_token_protected' => '/Token.php',
-          'php_token_public' => '/Token.php',
-          'php_token_question_mark' => '/Token.php',
-          'php_token_require' => '/Token.php',
-          'php_token_require_once' => '/Token.php',
-          'php_token_return' => '/Token.php',
-          'php_token_semicolon' => '/Token.php',
-          'php_token_sl' => '/Token.php',
-          'php_token_sl_equal' => '/Token.php',
-          'php_token_sr' => '/Token.php',
-          'php_token_sr_equal' => '/Token.php',
-          'php_token_start_heredoc' => '/Token.php',
-          'php_token_static' => '/Token.php',
-          'php_token_stream' => '/Token/Stream.php',
-          'php_token_stream_cachingfactory' => '/Token/Stream/CachingFactory.php',
-          'php_token_string' => '/Token.php',
-          'php_token_string_cast' => '/Token.php',
-          'php_token_string_varname' => '/Token.php',
-          'php_token_switch' => '/Token.php',
-          'php_token_throw' => '/Token.php',
-          'php_token_tilde' => '/Token.php',
-          'php_token_trait' => '/Token.php',
-          'php_token_try' => '/Token.php',
-          'php_token_unset' => '/Token.php',
-          'php_token_unset_cast' => '/Token.php',
-          'php_token_use' => '/Token.php',
-          'php_token_var' => '/Token.php',
-          'php_token_variable' => '/Token.php',
-          'php_token_while' => '/Token.php',
-          'php_token_whitespace' => '/Token.php',
-          'php_token_xor_equal' => '/Token.php',
-          'php_tokenwithscope' => '/Token.php'
-        );
-
-        $path = dirname(dirname(dirname(__FILE__)));
-    }
-
-    if ($class === NULL) {
-        $result = array(__FILE__);
-
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        require $path . $classes[$cn];
-    }
-}
-
-spl_autoload_register('php_tokenstream_autoload');
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator.php b/tests/PHPUnit/PHPUnit/Framework/Comparator.php
deleted file mode 100755
index 723d432e..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Abstract base class for comparators which compare values for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-abstract class PHPUnit_Framework_Comparator
-{
-    /**
-     * @var PHPUnit_Framework_ComparatorFactory
-     */
-    protected $factory;
-
-    /**
-     * @param PHPUnit_Framework_ComparatorFactory $factory
-     */
-    public function setFactory(PHPUnit_Framework_ComparatorFactory $factory)
-    {
-        $this->factory = $factory;
-    }
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    abstract public function accepts($expected, $actual);
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    abstract public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE);
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Array.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Array.php
deleted file mode 100755
index b9c05215..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Array.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares arrays for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Array extends PHPUnit_Framework_Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_array($expected) && is_array($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE, array &$processed = array())
-    {
-        if ($canonicalize) {
-            sort($expected);
-            sort($actual);
-        }
-
-        $remaining = $actual;
-        $expString = $actString = "Array (\n";
-        $equal = TRUE;
-
-        foreach ($expected as $key => $value) {
-            unset($remaining[$key]);
-
-            if (!array_key_exists($key, $actual)) {
-                $expString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($value)
-                );
-                $equal = FALSE;
-                continue;
-            }
-
-            try {
-                $this->factory->getComparatorFor($value, $actual[$key])->assertEquals($value, $actual[$key], $delta, $canonicalize, $ignoreCase, $processed);
-                $expString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($value)
-                );
-                $actString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  PHPUnit_Util_Type::shortenedExport($actual[$key])
-                );
-            }
-
-            catch (PHPUnit_Framework_ComparisonFailure $e) {
-                $expString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  $e->getExpectedAsString()
-                    ? $this->indent($e->getExpectedAsString())
-                    : PHPUnit_Util_Type::shortenedExport($e->getExpected())
-                );
-                $actString .= sprintf(
-                  "    %s => %s\n",
-
-                  PHPUnit_Util_Type::export($key),
-                  $e->getActualAsString()
-                    ? $this->indent($e->getActualAsString())
-                    : PHPUnit_Util_Type::shortenedExport($e->getActual())
-                );
-                $equal = FALSE;
-            }
-        }
-
-        foreach ($remaining as $key => $value) {
-            $actString .= sprintf(
-              "    %s => %s\n",
-
-              PHPUnit_Util_Type::export($key),
-              PHPUnit_Util_Type::shortenedExport($value)
-            );
-            $equal = FALSE;
-        }
-
-        $expString .= ')';
-        $actString .= ')';
-
-        if (!$equal) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              $expString,
-              $actString,
-              FALSE,
-             'Failed asserting that two arrays are equal.'
-            );
-        }
-    }
-
-    protected function indent($lines)
-    {
-        return trim(str_replace("\n", "\n    ", $lines));
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/DOMDocument.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/DOMDocument.php
deleted file mode 100755
index 327c4fd4..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/DOMDocument.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares DOMDocument instances for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_DOMDocument extends PHPUnit_Framework_Comparator_Object
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof DOMDocument && $actual instanceof DOMDocument;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        if ($expected->C14N() !== $actual->C14N()) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              $this->domToText($expected),
-              $this->domToText($actual),
-              FALSE,
-              'Failed asserting that two DOM documents are equal.'
-            );
-        }
-    }
-
-    /**
-     * Returns the normalized, whitespace-cleaned, and indented textual
-     * representation of a DOMDocument.
-     *
-     * @param DOMDocument $document
-     * @return string
-     */
-    protected function domToText(DOMDocument $document)
-    {
-        $document->formatOutput = TRUE;
-        $document->normalizeDocument();
-
-        return $document->saveXML();
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Double.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Double.php
deleted file mode 100755
index 47292fd3..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Double.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares doubles for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Double extends PHPUnit_Framework_Comparator_Numeric
-{
-    /**
-     * Smallest value available in PHP.
-     *
-     * @var float
-     */
-    const EPSILON = 0.0000000001;
-
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return (is_double($expected) || is_double($actual)) && is_numeric($expected) && is_numeric($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        if ($delta == 0) {
-            $delta = self::EPSILON;
-        }
-
-        parent::assertEquals($expected, $actual, $delta, $canonicalize, $ignoreCase);
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Exception.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Exception.php
deleted file mode 100755
index e020ea4c..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Exception.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares Exception instances for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Exception extends PHPUnit_Framework_Comparator_Object
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof Exception && $actual instanceof Exception;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset(
-            $array['file'],
-            $array['line'],
-            $array['trace'],
-            $array['string'], // some internal property of Exception
-            $array['xdebug_message'] // some internal property added by XDebug
-        );
-
-        return $array;
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/MockObject.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/MockObject.php
deleted file mode 100755
index 71f5b817..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/MockObject.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares PHPUnit_Framework_MockObject_MockObject instances for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_MockObject extends PHPUnit_Framework_Comparator_Object
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof PHPUnit_Framework_MockObject_MockObject && $actual instanceof PHPUnit_Framework_MockObject_MockObject;
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        $array = parent::toArray($object);
-
-        unset($array['invocationMocker']);
-
-        return $array;
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Numeric.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Numeric.php
deleted file mode 100755
index 4b6cd289..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Numeric.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares numerical values for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @author     Alexander <iam.asm89@gmail.com>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Numeric extends PHPUnit_Framework_Comparator_Scalar
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        // all numerical values, but not if one of them is a double
-        return is_numeric($expected) && is_numeric($actual) && !(is_double($expected) || is_double($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        if (is_infinite($actual) && is_infinite($expected)) {
-            return;
-        }
-
-        if (is_nan($actual) && is_nan($expected)) {
-            return;
-        }
-
-        if ((is_infinite($actual) XOR is_infinite($expected)) ||
-            (is_nan($actual) XOR is_nan($expected)) ||
-            abs($actual - $expected) > $delta) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              '',
-              '',
-              FALSE,
-              sprintf(
-                'Failed asserting that %s matches expected %s.',
-
-                PHPUnit_Util_Type::export($actual),
-                PHPUnit_Util_Type::export($expected)
-              )
-            );
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Object.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Object.php
deleted file mode 100755
index de6d76ab..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Object.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares objects for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Object extends PHPUnit_Framework_Comparator_Array
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_object($expected) && is_object($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE, array &$processed = array())
-    {
-        if (get_class($actual) !== get_class($expected)) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              PHPUnit_Util_Type::export($expected),
-              PHPUnit_Util_Type::export($actual),
-              FALSE,
-              sprintf(
-                '%s is not instance of expected class "%s".',
-
-                PHPUnit_Util_Type::export($actual),
-                get_class($expected)
-              )
-            );
-        }
-
-        // don't compare twice to allow for cyclic dependencies
-        if (in_array(array($actual, $expected), $processed, TRUE) ||
-            in_array(array($expected, $actual), $processed, TRUE)) {
-            return;
-        }
-
-        $processed[] = array($actual, $expected);
-
-        // don't compare objects if they are identical
-        // this helps to avoid the error "maximum function nesting level reached"
-        // CAUTION: this conditional clause is not tested
-        if ($actual !== $expected) {
-            try {
-                parent::assertEquals($this->toArray($expected), $this->toArray($actual), $delta, $canonicalize, $ignoreCase, $processed);
-            }
-
-            catch (PHPUnit_Framework_ComparisonFailure $e) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  // replace "Array" with "MyClass object"
-                  substr_replace($e->getExpectedAsString(), get_class($expected).' Object', 0, 5),
-                  substr_replace($e->getActualAsString(), get_class($actual).' Object', 0, 5),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-
-    /**
-     * Converts an object to an array containing all of its private, protected
-     * and public properties.
-     *
-     * @param  object $object
-     * @return array
-     */
-    protected function toArray($object)
-    {
-        return PHPUnit_Util_Type::toArray($object);
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Resource.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Resource.php
deleted file mode 100755
index 81c651c1..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Resource.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares resources for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Resource extends PHPUnit_Framework_Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return is_resource($expected) && is_resource($actual);
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        if ($actual != $expected) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              PHPUnit_Util_Type::export($expected),
-              PHPUnit_Util_Type::export($actual)
-            );
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Scalar.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Scalar.php
deleted file mode 100755
index a7d6fe72..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Scalar.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares scalar or NULL values for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Scalar extends PHPUnit_Framework_Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     * @since  Method available since Release 3.6.0
-     */
-    public function accepts($expected, $actual)
-    {
-        return ((is_scalar($expected) XOR NULL === $expected) &&
-                 (is_scalar($actual) XOR NULL === $actual))
-          // allow comparison between strings and objects featuring __toString()
-          || (is_string($expected) && is_object($actual) && method_exists($actual, '__toString'))
-          || (is_object($expected) && method_exists($expected, '__toString') && is_string($actual));
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        $expectedToCompare = $expected;
-        $actualToCompare = $actual;
-
-        // always compare as strings to avoid strange behaviour
-        // otherwise 0 == 'Foobar'
-        if (is_string($expected) || is_string($actual)) {
-            $expectedToCompare = (string)$expectedToCompare;
-            $actualToCompare = (string)$actualToCompare;
-
-            if ($ignoreCase) {
-                $expectedToCompare = strtolower($expectedToCompare);
-                $actualToCompare = strtolower($actualToCompare);
-            }
-        }
-
-        if ($expectedToCompare != $actualToCompare) {
-            if (is_string($expected) && is_string($actual)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two strings are equal.'
-                );
-            }
-
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              // no diff is required
-              '',
-              '',
-              FALSE,
-              sprintf(
-                'Failed asserting that %s matches expected %s.',
-
-                PHPUnit_Util_Type::export($actual),
-                PHPUnit_Util_Type::export($expected)
-              )
-            );
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/SplObjectStorage.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/SplObjectStorage.php
deleted file mode 100755
index d0ed4d3f..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/SplObjectStorage.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares SplObjectStorage instances for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_SplObjectStorage extends PHPUnit_Framework_Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return $expected instanceof SplObjectStorage && $actual instanceof SplObjectStorage;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        foreach ($actual as $object) {
-            if (!$expected->contains($object)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-
-        foreach ($expected as $object) {
-            if (!$actual->contains($object)) {
-                throw new PHPUnit_Framework_ComparisonFailure(
-                  $expected,
-                  $actual,
-                  PHPUnit_Util_Type::export($expected),
-                  PHPUnit_Util_Type::export($actual),
-                  FALSE,
-                  'Failed asserting that two objects are equal.'
-                );
-            }
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Comparator/Type.php b/tests/PHPUnit/PHPUnit/Framework/Comparator/Type.php
deleted file mode 100755
index e361e7c4..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Comparator/Type.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Compares values for type equality.
- *
- * @package    PHPUnit
- * @subpackage Framework_Comparator
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Comparator_Type extends PHPUnit_Framework_Comparator
-{
-    /**
-     * Returns whether the comparator can compare two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return boolean
-     */
-    public function accepts($expected, $actual)
-    {
-        return TRUE;
-    }
-
-    /**
-     * Asserts that two values are equal.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @param  float $delta The allowed numerical distance between two values to
-     *                      consider them equal
-     * @param  bool  $canonicalize If set to TRUE, arrays are sorted before
-     *                             comparison
-     * @param  bool  $ignoreCase If set to TRUE, upper- and lowercasing is
-     *                           ignored when comparing string values
-     * @throws PHPUnit_Framework_ComparisonFailure Thrown when the comparison
-     *                           fails. Contains information about the
-     *                           specific errors that lead to the failure.
-     */
-    public function assertEquals($expected, $actual, $delta = 0, $canonicalize = FALSE, $ignoreCase = FALSE)
-    {
-        if (gettype($expected) != gettype($actual)) {
-            throw new PHPUnit_Framework_ComparisonFailure(
-              $expected,
-              $actual,
-              // we don't need a diff
-              '',
-              '',
-              FALSE,
-              sprintf(
-                '%s does not match expected type "%s".',
-
-                PHPUnit_Util_Type::shortenedExport($actual),
-                gettype($expected)
-              )
-            );
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/ComparatorFactory.php b/tests/PHPUnit/PHPUnit/Framework/ComparatorFactory.php
deleted file mode 100755
index 624794b4..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/ComparatorFactory.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Factory for comparators which compare values for equality.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_ComparatorFactory
-{
-    /**
-     * @var array
-     */
-    protected $comparators = array();
-
-    /**
-     * @var PHPUnit_Framework_ComparatorFactory
-     */
-    private static $defaultInstance = NULL;
-
-    /**
-     * Constructs a new factory.
-     */
-    public function __construct()
-    {
-        $this->register(new PHPUnit_Framework_Comparator_Type);
-        $this->register(new PHPUnit_Framework_Comparator_Scalar);
-        $this->register(new PHPUnit_Framework_Comparator_Numeric);
-        $this->register(new PHPUnit_Framework_Comparator_Double);
-        $this->register(new PHPUnit_Framework_Comparator_Array);
-        $this->register(new PHPUnit_Framework_Comparator_Resource);
-        $this->register(new PHPUnit_Framework_Comparator_Object);
-        $this->register(new PHPUnit_Framework_Comparator_Exception);
-        $this->register(new PHPUnit_Framework_Comparator_SplObjectStorage);
-        $this->register(new PHPUnit_Framework_Comparator_DOMDocument);
-        $this->register(new PHPUnit_Framework_Comparator_MockObject);
-    }
-
-    /**
-     * Returns the default instance.
-     *
-     * @return PHPUnit_Framework_ComparatorFactory
-     */
-    public static function getDefaultInstance()
-    {
-        if (self::$defaultInstance === NULL) {
-            self::$defaultInstance = new PHPUnit_Framework_ComparatorFactory;
-        }
-
-        return self::$defaultInstance;
-    }
-
-    /**
-     * Returns the correct comparator for comparing two values.
-     *
-     * @param  mixed $expected The first value to compare
-     * @param  mixed $actual The second value to compare
-     * @return PHPUnit_Framework_Comparator
-     */
-    public function getComparatorFor($expected, $actual)
-    {
-        foreach ($this->comparators as $comparator) {
-            if ($comparator->accepts($expected, $actual)) {
-                return $comparator;
-            }
-        }
-
-        throw new InvalidArgumentException(
-          sprintf(
-            'No comparator is registered for comparing the types "%s" and "%s"',
-            gettype($expected), gettype($actual)
-          )
-        );
-    }
-
-    /**
-     * Registers a new comparator.
-     *
-     * This comparator will be returned by getInstance() if its accept() method
-     * returns TRUE for the compared values. It has higher priority than the
-     * existing comparators, meaning that its accept() method will be tested
-     * before those of the other comparators.
-     *
-     * @param  PHPUnit_Framework_Comparator $comparator The registered comparator
-     */
-    public function register(PHPUnit_Framework_Comparator $comparator)
-    {
-        array_unshift($this->comparators, $comparator);
-        $comparator->setFactory($this);
-    }
-
-    /**
-     * Unregisters a comparator.
-     *
-     * This comparator will no longer be returned by getInstance().
-     *
-     * @param  PHPUnit_Framework_Comparator $comparator The unregistered comparator
-     */
-    public function unregister(PHPUnit_Framework_Comparator $comparator)
-    {
-        foreach ($this->comparators as $key => $_comparator) {
-            if ($comparator === $_comparator) {
-                unset($this->comparators[$key]);
-            }
-        }
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Constraint/Composite.php b/tests/PHPUnit/PHPUnit/Framework/Constraint/Composite.php
deleted file mode 100755
index e59b48a1..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Constraint/Composite.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- *
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-
-abstract class PHPUnit_Framework_Constraint_Composite extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var PHPUnit_Framework_Constraint
-     */
-    protected $innerConstraint;
-
-    /**
-     * @param PHPUnit_Framework_Constraint $innerConstraint
-     * @param string                       $attributeName
-     */
-    public function __construct(PHPUnit_Framework_Constraint $innerConstraint)
-    {
-        $this->innerConstraint = $innerConstraint;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other
-     *
-     * If $returnResult is set to FALSE (the default), an exception is thrown
-     * in case of a failure. NULL is returned otherwise.
-     *
-     * If $returnResult is TRUE, the result of the evaluation is returned as
-     * a boolean value instead: TRUE in case of success, FALSE in case of a
-     * failure.
-     *
-     * @param  mixed $other Value or object to evaluate.
-     * @param  string $description Additional information about the test
-     * @param  bool $returnResult Whether to return a result or throw an exception
-     * @return mixed
-     * @throws PHPUnit_Framework_ExpectationFailedException
-     */
-    public function evaluate($other, $description = '', $returnResult = FALSE)
-    {
-        try {
-            return $this->innerConstraint->evaluate(
-              $other,
-              $description,
-              $returnResult
-            );
-        }
-
-        catch (PHPUnit_Framework_ExpectationFailedException $e) {
-            $this->fail($other, $description);
-        }
-    }
-
-    /**
-     * Counts the number of constraint elements.
-     *
-     * @return integer
-     */
-    public function count()
-    {
-        return count($this->innerConstraint);
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Constraint/Count.php b/tests/PHPUnit/PHPUnit/Framework/Constraint/Count.php
deleted file mode 100755
index a21eff81..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Constraint/Count.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- *
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Constraint_Count extends PHPUnit_Framework_Constraint
-{
-    /**
-     * @var integer
-     */
-    protected $expectedCount = 0;
-
-    /**
-     * @param integer $expected
-     */
-    public function __construct($expected)
-    {
-        $this->expectedCount = $expected;
-    }
-
-    /**
-     * Evaluates the constraint for parameter $other. Returns TRUE if the
-     * constraint is met, FALSE otherwise.
-     *
-     * @param mixed $other
-     * @return boolean
-     */
-    protected function matches($other)
-    {
-        return $this->expectedCount === $this->getCountOf($other);
-    }
-
-    /**
-     * @param mixed $other
-     * @return boolean
-     */
-    protected function getCountOf($other)
-    {
-        if ($other instanceof Countable || is_array($other)) {
-            return count($other);
-        }
-
-        else if ($other instanceof Iterator) {
-            return iterator_count($other);
-        }
-    }
-
-
-    /**
-     * Returns the description of the failure
-     *
-     * The beginning of failure messages is "Failed asserting that" in most
-     * cases. This method should return the second part of that sentence.
-     *
-     * @param  mixed $other Evaluated value or object.
-     * @return string
-     */
-    protected function failureDescription($other)
-    {
-        return sprintf(
-          'actual size %d matches expected size %d',
-
-          $this->getCountOf($other),
-          $this->expectedCount
-        );
-    }
-
-    /**
-     * @return string
-     */
-    public function toString()
-    {
-        return 'count matches ';
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Constraint/SameSize.php b/tests/PHPUnit/PHPUnit/Framework/Constraint/SameSize.php
deleted file mode 100755
index db2e25c6..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Constraint/SameSize.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- *
- *
- * @package    PHPUnit
- * @subpackage Framework_Constraint
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @author     Bernhard Schussek <bschussek@2bepublished.at>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_Constraint_SameSize extends PHPUnit_Framework_Constraint_Count
-{
-    /**
-     * @var integer
-     */
-    protected $expectedCount;
-
-    /**
-     * @param integer $expected
-     */
-    public function __construct($expected)
-    {
-        $this->expectedCount = $this->getCountOf($expected);
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/Error/Deprecated.php b/tests/PHPUnit/PHPUnit/Framework/Error/Deprecated.php
deleted file mode 100755
index ed6c2ca4..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/Error/Deprecated.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework_Error
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.3.0
- */
-
-/**
- * Wrapper for PHP deprecated errors.
- * You can disable deprecated-to-exception conversion by setting
- *
- * <code>
- * PHPUnit_Framework_Error_Deprecated::$enabled = FALSE;
- * </code>
- *
- * @package    PHPUnit
- * @subpackage Framework_Error
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.3.0
- */
-class PHPUnit_Framework_Error_Deprecated extends PHPUnit_Framework_Error
-{
-    public static $enabled = TRUE;
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/MockObject/Autoload.php b/tests/PHPUnit/PHPUnit/Framework/MockObject/Autoload.php
deleted file mode 100755
index 64de1299..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/MockObject/Autoload.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2002-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.1.0
- */
-
-function phpunit_mockobject_autoload($class = NULL) {
-    static $classes = NULL;
-    static $path = NULL;
-
-    if ($classes === NULL) {
-        $classes = array(
-          'phpunit_framework_mockobject_builder_identity' => '/Framework/MockObject/Builder/Identity.php',
-          'phpunit_framework_mockobject_builder_invocationmocker' => '/Framework/MockObject/Builder/InvocationMocker.php',
-          'phpunit_framework_mockobject_builder_match' => '/Framework/MockObject/Builder/Match.php',
-          'phpunit_framework_mockobject_builder_methodnamematch' => '/Framework/MockObject/Builder/MethodNameMatch.php',
-          'phpunit_framework_mockobject_builder_namespace' => '/Framework/MockObject/Builder/Namespace.php',
-          'phpunit_framework_mockobject_builder_parametersmatch' => '/Framework/MockObject/Builder/ParametersMatch.php',
-          'phpunit_framework_mockobject_builder_stub' => '/Framework/MockObject/Builder/Stub.php',
-          'phpunit_framework_mockobject_generator' => '/Framework/MockObject/Generator.php',
-          'phpunit_framework_mockobject_invocation' => '/Framework/MockObject/Invocation.php',
-          'phpunit_framework_mockobject_invocation_object' => '/Framework/MockObject/Invocation/Object.php',
-          'phpunit_framework_mockobject_invocation_static' => '/Framework/MockObject/Invocation/Static.php',
-          'phpunit_framework_mockobject_invocationmocker' => '/Framework/MockObject/InvocationMocker.php',
-          'phpunit_framework_mockobject_invokable' => '/Framework/MockObject/Invokable.php',
-          'phpunit_framework_mockobject_matcher' => '/Framework/MockObject/Matcher.php',
-          'phpunit_framework_mockobject_matcher_anyinvokedcount' => '/Framework/MockObject/Matcher/AnyInvokedCount.php',
-          'phpunit_framework_mockobject_matcher_anyparameters' => '/Framework/MockObject/Matcher/AnyParameters.php',
-          'phpunit_framework_mockobject_matcher_invocation' => '/Framework/MockObject/Matcher/Invocation.php',
-          'phpunit_framework_mockobject_matcher_invokedatindex' => '/Framework/MockObject/Matcher/InvokedAtIndex.php',
-          'phpunit_framework_mockobject_matcher_invokedatleastonce' => '/Framework/MockObject/Matcher/InvokedAtLeastOnce.php',
-          'phpunit_framework_mockobject_matcher_invokedcount' => '/Framework/MockObject/Matcher/InvokedCount.php',
-          'phpunit_framework_mockobject_matcher_invokedrecorder' => '/Framework/MockObject/Matcher/InvokedRecorder.php',
-          'phpunit_framework_mockobject_matcher_methodname' => '/Framework/MockObject/Matcher/MethodName.php',
-          'phpunit_framework_mockobject_matcher_parameters' => '/Framework/MockObject/Matcher/Parameters.php',
-          'phpunit_framework_mockobject_matcher_statelessinvocation' => '/Framework/MockObject/Matcher/StatelessInvocation.php',
-          'phpunit_framework_mockobject_mockbuilder' => '/Framework/MockObject/MockBuilder.php',
-          'phpunit_framework_mockobject_mockobject' => '/Framework/MockObject/MockObject.php',
-          'phpunit_framework_mockobject_stub' => '/Framework/MockObject/Stub.php',
-          'phpunit_framework_mockobject_stub_consecutivecalls' => '/Framework/MockObject/Stub/ConsecutiveCalls.php',
-          'phpunit_framework_mockobject_stub_exception' => '/Framework/MockObject/Stub/Exception.php',
-          'phpunit_framework_mockobject_stub_matchercollection' => '/Framework/MockObject/Stub/MatcherCollection.php',
-          'phpunit_framework_mockobject_stub_return' => '/Framework/MockObject/Stub/Return.php',
-          'phpunit_framework_mockobject_stub_returnargument' => '/Framework/MockObject/Stub/ReturnArgument.php',
-          'phpunit_framework_mockobject_stub_returncallback' => '/Framework/MockObject/Stub/ReturnCallback.php',
-          'phpunit_framework_mockobject_stub_returnself' => '/Framework/MockObject/Stub/ReturnSelf.php',
-          'phpunit_framework_mockobject_stub_returnvaluemap' => '/Framework/MockObject/Stub/ReturnValueMap.php',
-          'phpunit_framework_mockobject_verifiable' => '/Framework/MockObject/Verifiable.php'
-        );
-
-        $path = dirname(dirname(dirname(__FILE__)));
-    }
-
-    if ($class === NULL) {
-        $result = array(__FILE__);
-
-        foreach ($classes as $file) {
-            $result[] = $path . $file;
-        }
-
-        return $result;
-    }
-
-    $cn = strtolower($class);
-
-    if (isset($classes[$cn])) {
-        $file = $path . $classes[$cn];
-
-        require $file;
-    }
-}
-
-spl_autoload_register('phpunit_mockobject_autoload');
diff --git a/tests/PHPUnit/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist b/tests/PHPUnit/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist
deleted file mode 100755
index 48b4bbf2..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/MockObject/Generator/trait_class.tpl.dist
+++ /dev/null
@@ -1,4 +0,0 @@
-class {class_name}
-{
-    use {trait_name};
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php b/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php
deleted file mode 100755
index 9c5c1dcd..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnSelf.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
- * @copyright  2010 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Stubs a method by returning the current object.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @author     Kris Wallsmith <kris.wallsmith@gmail.com>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.0
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      Class available since Release 1.1.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnSelf implements PHPUnit_Framework_MockObject_Stub
-{
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        if (!$invocation instanceof PHPUnit_Framework_MockObject_Invocation_Object) {
-            throw new PHPUnit_Framework_Exception(
-                'The current object can only be returned when mocking an ' .
-                'object, not a static class.'
-            );
-        }
-
-        return $invocation->object;
-    }
-
-    public function toString()
-    {
-        return 'return the current object';
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php b/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php
deleted file mode 100755
index 99324ea6..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/MockObject/Stub/ReturnValueMap.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2010-2011, Sebastian Bergmann <sb@sebastian-bergmann.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      File available since Release 1.1.0
- */
-
-/**
- * Stubs a method by returning a value from a map.
- *
- * @package    PHPUnit_MockObject
- * @author     Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @copyright  2010-2011 Sebastian Bergmann <sb@sebastian-bergmann.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 1.1.0
- * @link       http://github.com/sebastianbergmann/phpunit-mock-objects
- * @since      Class available since Release 1.1.0
- */
-class PHPUnit_Framework_MockObject_Stub_ReturnValueMap implements PHPUnit_Framework_MockObject_Stub
-{
-    protected $valueMap;
-
-    public function __construct(array $valueMap)
-    {
-        $this->valueMap = $valueMap;
-    }
-
-    public function invoke(PHPUnit_Framework_MockObject_Invocation $invocation)
-    {
-        $parameterCount = count($invocation->parameters);
-
-        foreach ($this->valueMap as $map) {
-            if (!is_array($map) || $parameterCount != count($map) - 1) {
-                continue;
-            }
-
-            $return = array_pop($map);
-            if ($invocation->parameters === $map) {
-                return $return;
-            }
-        }
-
-        return NULL;
-    }
-
-    public function toString()
-    {
-        return 'return value from a map';
-    }
-}
diff --git a/tests/PHPUnit/PHPUnit/Framework/OutputError.php b/tests/PHPUnit/PHPUnit/Framework/OutputError.php
deleted file mode 100755
index 8203bfe2..00000000
--- a/tests/PHPUnit/PHPUnit/Framework/OutputError.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * Extension to PHPUnit_Framework_AssertionFailedError to mark the special
- * case of a test that printed output.
- *
- * @package    PHPUnit
- * @subpackage Framework
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Framework_OutputError extends PHPUnit_Framework_AssertionFailedError
-{
-}
diff --git a/tests/PHPUnit/PHPUnit/Util/String.php b/tests/PHPUnit/PHPUnit/Util/String.php
deleted file mode 100755
index c93594a4..00000000
--- a/tests/PHPUnit/PHPUnit/Util/String.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-/**
- * PHPUnit
- *
- * Copyright (c) 2002-2011, Sebastian Bergmann <sebastian@phpunit.de>.
- * 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 Sebastian Bergmann nor the names of his
- *     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 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    PHPUnit
- * @subpackage Util
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @link       http://www.phpunit.de/
- * @since      File available since Release 3.6.0
- */
-
-/**
- * String helpers.
- *
- * @package    PHPUnit
- * @subpackage Util
- * @author     Sebastian Bergmann <sebastian@phpunit.de>
- * @copyright  2002-2011 Sebastian Bergmann <sebastian@phpunit.de>
- * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version    Release: 3.6.3
- * @link       http://www.phpunit.de/
- * @since      Class available since Release 3.6.0
- */
-class PHPUnit_Util_String
-{
-    /**
-     * Converts a string to UTF-8 encoding.
-     *
-     * @param  string $string
-     * @return string
-     */
-    public static function convertToUtf8($string)
-    {
-        if (!self::isUtf8($string)) {
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, 'UTF-8');
-            } else {
-                $string = utf8_encode($string);
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * Checks a string for UTF-8 encoding.
-     *
-     * @param  string $string
-     * @return boolean
-     */
-    protected static function isUtf8($string)
-    {
-        $length = strlen($string);
-
-        for ($i = 0; $i < $length; $i++) {
-            if (ord($string[$i]) < 0x80) {
-                $n = 0;
-            }
-
-            else if ((ord($string[$i]) & 0xE0) == 0xC0) {
-                $n = 1;
-            }
-
-            else if ((ord($string[$i]) & 0xF0) == 0xE0) {
-                $n = 2;
-            }
-
-            else if ((ord($string[$i]) & 0xF0) == 0xF0) {
-                $n = 3;
-            }
-
-            else {
-                return FALSE;
-            }
-
-            for ($j = 0; $j < $n; $j++) {
-                if ((++$i == $length) || ((ord($string[$i]) & 0xC0) != 0x80)) {
-                    return FALSE;
-                }
-            }
-        }
-
-        return TRUE;
-    }
-}
diff --git a/tests/SugarTestHelper.php b/tests/SugarTestHelper.php
index e725490a..9078b7f6 100755
--- a/tests/SugarTestHelper.php
+++ b/tests/SugarTestHelper.php
@@ -266,3 +266,356 @@ class SugarMockLogger
 		return count($this->messages);
 	}
 }
+
+/**
+ * Own exception for SugarTestHelper class
+ *
+ * @author mgusev@sugarcrm.com
+ */
+class SugarTestHelperException extends PHPUnit_Framework_Exception
+{
+
+}
+
+/**
+ * Helper for initialization of global variables of SugarCRM
+ *
+ * @author mgusev@sugarcrm.com
+ */
+class SugarTestHelper
+{
+    /**
+     * @var array array of registered vars. It allows helper to unregister them on tearDown
+     */
+    protected static $registeredVars = array();
+
+    /**
+     * @var array array of global vars. They are storing on init one time and restoring in global scope each tearDown
+     */
+    protected static $initVars = array(
+        'GLOBALS' => array()
+    );
+
+    /**
+     * @var array of system preference of SugarCRM as theme etc. They are storing on init one time and restoring each tearDown
+     */
+    protected static $systemVars = array();
+
+    /**
+     * @var bool is SugarTestHelper inited or not. Just to skip initialization on the second and others call of init method
+     */
+    protected static $isInited = false;
+
+    /**
+     * All methods are static because of it we disable constructor
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * All methods are static because of it we disable clone
+     */
+    private function __clone()
+    {
+    }
+
+    /**
+     * Initialization of main variables of SugarCRM in global scope
+     *
+     * @static
+     */
+    public static function init()
+    {
+        if (self::$isInited == true)
+        {
+            return true;
+        }
+
+        // initialization & backup of sugar_config
+        self::$initVars['GLOBALS']['sugar_config'] = null;
+        if ($GLOBALS['sugar_config'])
+        {
+            self::$initVars['GLOBALS']['sugar_config'] = $GLOBALS['sugar_config'];
+        }
+        if (self::$initVars['GLOBALS']['sugar_config'] == false)
+        {
+            global $sugar_config;
+            if (is_file('config.php'))
+            {
+                require_once('config.php');
+            }
+            if (is_file('config_override.php'))
+            {
+                require_once('config_override.php');
+            }
+            self::$initVars['GLOBALS']['sugar_config'] = $GLOBALS['sugar_config'];
+        }
+
+        // backup of current_language
+        self::$initVars['GLOBALS']['current_language'] = 'en_us';
+        if (isset($sugar_config['current_language']))
+        {
+            self::$initVars['GLOBALS']['current_language'] = $sugar_config['current_language'];
+        }
+        if (isset($GLOBALS['current_language']))
+        {
+            self::$initVars['GLOBALS']['current_language'] = $GLOBALS['current_language'];
+        }
+        $GLOBALS['current_language'] = self::$initVars['GLOBALS']['current_language'];
+
+        // backup of reload_vardefs
+        self::$initVars['GLOBALS']['reload_vardefs'] = null;
+        if (isset($GLOBALS['reload_vardefs']))
+        {
+            self::$initVars['GLOBALS']['reload_vardefs'] = $GLOBALS['reload_vardefs'];
+        }
+
+        // backup of locale
+        self::$initVars['GLOBALS']['locale'] = null;
+        if (isset($GLOBALS['locale']))
+        {
+            self::$initVars['GLOBALS']['locale'] = $GLOBALS['locale'];
+        }
+        if (self::$initVars['GLOBALS']['locale'] == false)
+        {
+            self::$initVars['GLOBALS']['locale'] = new Localization();
+        }
+
+        // backup of service_object
+        self::$initVars['GLOBALS']['service_object'] = null;
+        if (isset($GLOBALS['service_object']))
+        {
+            self::$initVars['GLOBALS']['service_object'] = $GLOBALS['service_object'];
+        }
+
+        // backup of SugarThemeRegistry
+        self::$systemVars['SugarThemeRegistry'] = SugarThemeRegistry::current();
+
+        self::$isInited = true;
+    }
+
+    /**
+     * Checking is there helper for variable or not
+     *
+     * @static
+     * @param string $varName name of global variable of SugarCRM
+     * @return bool is there helper for a variable or not
+     * @throws SugarTestHelperException fired when there is no implementation of helper for a variable
+     */
+    protected static function checkHelper($varName)
+    {
+        if (method_exists(__CLASS__, 'setUp_' . $varName) == false)
+        {
+            throw new SugarTestHelperException('setUp for $' . $varName . ' is not implemented. ' . __CLASS__ . '::setUp_' . $varName);
+        }
+    }
+
+    /**
+     * Entry point for setup of global variable
+     *
+     * @static
+     * @param string $varName name of global variable of SugarCRM
+     * @param array $params some parameters for helper. For example for $mod_strings or $current_user
+     * @return bool is variable setuped or not
+     */
+    public static function setUp($varName, $params = array())
+    {
+        self::init();
+        self::checkHelper($varName);
+        return call_user_func(__CLASS__ . '::setUp_' . $varName, $params);
+    }
+
+    /**
+     * Clean up all registered variables and restore $initVars and $systemVars
+     * @static
+     * @return bool status of tearDown
+     */
+    public static function tearDown()
+    {
+        self::init();
+        foreach(self::$registeredVars as $varName => $isCalled)
+        {
+            if ($isCalled)
+            {
+                unset(self::$registeredVars[$varName]);
+                if (method_exists(__CLASS__, 'tearDown_' . $varName))
+                {
+                    call_user_func(__CLASS__ . '::tearDown_' . $varName, array());
+                }
+                elseif (isset($GLOBALS[$varName]))
+                {
+                    unset($GLOBALS[$varName]);
+                }
+            }
+        }
+
+        // Restoring of system variables
+        foreach(self::$initVars as $scope => $vars)
+        {
+            foreach ($vars as $name => $value)
+            {
+                $GLOBALS[$scope][$name] = $value;
+            }
+        }
+
+        // Restoring of theme
+        SugarThemeRegistry::set(self::$systemVars['SugarThemeRegistry']->dirName);
+
+        return true;
+    }
+
+    /**
+     * Registration of $current_user in global scope
+     *
+     * @static
+     * @param array $params parameters for SugarTestUserUtilities::createAnonymousUser method
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_current_user(array $params)
+    {
+        self::$registeredVars['current_user'] = true;
+        $GLOBALS['current_user'] = call_user_func_array('SugarTestUserUtilities::createAnonymousUser', $params);
+        return true;
+    }
+
+    /**
+     * Removal of $current_user from global scope
+     *
+     * @static
+     * @return bool is variable removed or not
+     */
+    protected static function tearDown_current_user()
+    {
+        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+        unset($GLOBALS['current_user']);
+        return true;
+    }
+
+    /**
+     * Registration of $beanList in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_beanList()
+    {
+        self::$registeredVars['beanList'] = true;
+        global $beanList;
+        require('include/modules.php');
+        return true;
+    }
+
+    /**
+     * Registration of $beanFiles in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_beanFiles()
+    {
+        self::$registeredVars['beanFiles'] = true;
+        global $beanFiles;
+        require('include/modules.php');
+        return true;
+    }
+
+    /**
+     * Registration of $moduleList in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_moduleList()
+    {
+        self::$registeredVars['moduleList'] = true;
+        self::setUp_app_list_strings();
+        $GLOBALS['moduleList'] = $GLOBALS['app_list_strings']['moduleList'];
+        return true;
+    }
+
+    /**
+     * Registration of $modListHeader in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_modListHeader()
+    {
+        self::$registeredVars['modListHeader'] = true;
+        if (isset($GLOBALS['current_user']) == false)
+        {
+            self::setUp_current_user(array(
+                true,
+                1
+            ));
+        }
+        $GLOBALS['modListHeader'] = query_module_access_list($GLOBALS['current_user']);
+        return true;
+    }
+
+    /**
+     * Registration of $app_strings in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_app_strings()
+    {
+        self::$registeredVars['app_strings'] = true;
+        $GLOBALS['app_strings'] = return_application_language($GLOBALS['current_language']);
+        return true;
+    }
+
+    /**
+     * Registration of $app_list_strings in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_app_list_strings()
+    {
+        self::$registeredVars['app_list_strings'] = true;
+        $GLOBALS['app_list_strings'] = return_app_list_strings_language($GLOBALS['current_language']);
+        return true;
+    }
+
+    /**
+     * Registration of $timedate in global scope
+     *
+     * @static
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_timedate()
+    {
+        self::$registeredVars['timedate'] = true;
+        $GLOBALS['timedate'] = TimeDate::getInstance();
+        return true;
+    }
+
+    /**
+     * Removal of $timedate from global scope
+     *
+     * @static
+     * @return bool is variable removed or not
+     */
+    protected static function tearDown_timedate()
+    {
+        $GLOBALS['timedate']->clearCache();
+        return true;
+    }
+
+    /**
+     * Registration of $mod_strings in global scope
+     *
+     * @static
+     * @param array $params parameters for return_module_language function
+     * @return bool is variable setuped or not
+     */
+    protected static function setUp_mod_strings(array $params)
+    {
+        self::$registeredVars['mod_strings'] = true;
+        $GLOBALS['mod_strings'] = return_module_language($GLOBALS['current_language'], $params[0]);
+        return true;
+    }
+}
diff --git a/tests/data/Bug52133Test.php b/tests/data/Bug52133Test.php
new file mode 100755
index 00000000..1699907e
--- /dev/null
+++ b/tests/data/Bug52133Test.php
@@ -0,0 +1,109 @@
+<?php
+
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+class Bug52113Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    protected $bean;
+    protected $hook;
+
+    public static function setUpBeforeClass()
+    {
+        $GLOBALS['current_user'] = SugarTestUserUtilities::createAnonymousUser();
+    }
+
+    public static function tearDownAfterClass()
+    {
+	    SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+        unset($GLOBALS['current_user']);
+    }
+
+    public function setUp()
+    {
+        $this->bean = new Account();
+        Bug52113TestHook::$count = 0;
+        LogicHook::refreshHooks();
+	}
+
+	public function tearDown()
+	{
+	    if(!empty($this->hook)) {
+	        call_user_func_array('remove_logic_hook', $this->hook);
+	    }
+	}
+
+    /**
+     * @ticket 52113
+     */
+    public function testCallLogicHookLoop()
+    {
+        $this->hook = array('Accounts', 'test_event', Array(1, 'Test hook', __FILE__, 'Bug52113TestHook', 'count'));
+        call_user_func_array('check_logic_hook_file', $this->hook);
+        for($i=0;$i<50;$i++) {
+            $this->bean->call_custom_logic("test_event");
+        }
+        $this->assertEquals(50, Bug52113TestHook::$count);
+    }
+
+	/**
+     * @ticket 52113
+     */
+    public function testCallLogicHookRecursive()
+    {
+        $this->hook = array('Accounts', 'test_event', Array(1, 'Test hook', __FILE__, 'Bug52113TestHook', 'recurse'));
+        call_user_func_array('check_logic_hook_file', $this->hook);
+        for($i=0;$i<20;$i++) {
+            $this->bean->call_custom_logic("test_event");
+        }
+        $this->assertEquals(220, Bug52113TestHook::$count);
+    }
+}
+
+class Bug52113TestHook
+{
+    static public $count = 0;
+    public function count()
+    {
+        self::$count++;
+    }
+
+    public function recurse($bean, $event)
+    {
+        $this->count();
+        $bean->call_custom_logic($event);
+    }
+}
diff --git a/tests/data/Bug53223Test.php b/tests/data/Bug53223Test.php
new file mode 100755
index 00000000..9df97d11
--- /dev/null
+++ b/tests/data/Bug53223Test.php
@@ -0,0 +1,203 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+
+
+require_once 'modules/ModuleBuilder/parsers/relationships/DeployedRelationships.php' ;
+require_once 'include/SubPanel/SubPanelDefinitions.php';
+require_once 'include/SubPanel/SubPanel.php';
+/**
+ * Bug #53223
+ * wrong relationship from subpanel create button
+ *
+ * @ticket 53223
+ */
+class Bug53223Test extends Sugar_PHPUnit_Framework_OutputTestCase //Sugar_PHPUnit_Framework_TestCase
+{
+    /**
+     * @var DeployedRelationships
+     */
+    protected $relationships = null;
+
+    /**
+     * @var OneToOneRelationship
+     */
+    protected $relationship = null;
+
+    private $parentAccount;
+
+    private function createRelationship($lhs_module, $rhs_module = null, $relationship_type = 'one-to-many')
+    {
+        $rhs_module = $rhs_module == null ? $lhs_module : $rhs_module;
+
+        // Adding relation between products and users
+        $this->relationships = new DeployedRelationships($lhs_module);
+        $definition = array(
+            'lhs_module' => $lhs_module,
+            'relationship_type' => $relationship_type,
+            'rhs_module' => $rhs_module,
+            'lhs_label' => $lhs_module,
+            'rhs_label' => $rhs_module,
+            'rhs_subpanel' => 'default'
+        );
+        $this->relationship = RelationshipFactory::newRelationship($definition);
+        $this->relationships->add($this->relationship);
+        $this->relationships->save();
+        $this->relationships->build();
+        LanguageManager::clearLanguageCache($lhs_module);
+
+        // Updating $dictionary by created relation
+        global $dictionary;
+        $moduleInstaller = new ModuleInstaller();
+        $moduleInstaller->silent = true;
+        $moduleInstaller->rebuild_tabledictionary();
+        require 'modules/TableDictionary.php';
+
+        // Updating vardefs
+        VardefManager::$linkFields = array();
+        VardefManager::clearVardef();
+        VardefManager::refreshVardefs($lhs_module, BeanFactory::getObjectName($lhs_module));
+        if ( $lhs_module != $rhs_module )
+        {
+            VardefManager::refreshVardefs($rhs_module, BeanFactory::getObjectName($rhs_module));
+        }
+        SugarRelationshipFactory::rebuildCache();
+    }
+
+    private function deleteRelationship($lhs_module, $rhs_module = null, $rel_name = null)
+    {
+        $rhs_module = $rhs_module == null ? $lhs_module : $rhs_module;
+
+        $this->relationships = new DeployedRelationships($lhs_module);
+        $this->relationships->delete($rel_name !== null ? $rel_name : $this->relationship->getName());
+        $this->relationships->save();
+        SugarRelationshipFactory::deleteCache();
+        LanguageManager::clearLanguageCache($lhs_module);
+        if ( $lhs_module != $rhs_module )
+        {
+            LanguageManager::clearLanguageCache($rhs_module);
+        }
+    }
+
+    public function setUp()
+    {
+        $this->markTestIncomplete("This test is not yet complete. Artem is working on it");
+        $beanList = array();
+        $beanFiles = array();
+        require('include/modules.php');
+        $GLOBALS['beanList'] = $beanList;
+        $GLOBALS['beanFiles'] = $beanFiles;
+
+        $GLOBALS['current_user'] = SugarTestUserUtilities::createAnonymousUser();
+        $GLOBALS['current_user']->is_admin = 1;
+
+        $GLOBALS['app_strings'] = return_application_language($GLOBALS['current_language']);
+        $GLOBALS['app_list_strings'] = return_app_list_strings_language($GLOBALS['current_language']);
+
+        $this->createRelationship('Accounts');
+        $this->parentAccount = SugarTestAccountUtilities::createAccount();
+    }
+
+    public function tearDown()
+    {
+        $this->deleteRelationship('Accounts');
+
+        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+        unset($GLOBALS['current_user']);
+
+        unset($GLOBALS['beanFiles'], $GLOBALS['beanList']);
+        unset($GLOBALS['app_strings'], $GLOBALS['app_list_strings'], $GLOBALS['mod_strings']);
+
+        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+        SugarTestAccountUtilities::removeAllCreatedAccounts();
+
+        unset($this->parentAccount);
+    }
+
+    /**
+     * @group 53223
+     */
+    public function testOneToManyRelationshipModule2Modult()
+    {
+        $_REQUEST['relate_id'] = $this->parentAccount->id;
+        $_REQUEST['relate_to'] = $this->relationship->getName();
+
+        // create new account
+        $objAccount = new Account();
+        $objAccount->name = "AccountBug53223".$_REQUEST['relate_to'].time();
+        $objAccount->save();
+        SugarTestAccountUtilities::setCreatedAccount(array($objAccount->id));
+
+        // Retrieve new data
+        $this->parentAccount->retrieve($this->parentAccount->id);
+        $objAccount->retrieve($objAccount->id);
+        $this->parentAccount->load_relationship($this->relationship->getName());
+        $objAccount->load_relationship($this->relationship->getName());
+
+        // Getting data of subpanel of parent bean
+        $_REQUEST['module'] = 'Accounts';
+        $_REQUEST['action'] = 'DetailView';
+        $_REQUEST['record'] = $this->parentAccount->id;
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        unset($GLOBALS['focus']);
+
+        $subpanels = new SubPanelDefinitions($this->parentAccount, 'Accounts');
+        $subpanelDef = $subpanels->load_subpanel($this->relationship->getName().'accounts_ida');
+        $subpanel = new SubPanel('Accounts', $this->parentAccount->id, 'default', $subpanelDef);
+        $subpanel->setTemplateFile('include/SubPanel/SubPanelDynamic.html');
+        $subpanel->display();
+        $actual = $this->getActualOutput();
+        $this->assertContains($objAccount->name, $actual, 'Account name is not displayed in subpanel of parent account');
+
+        ob_clean();
+
+        // Getting data of subpanel of child bean
+        $_REQUEST['module'] = 'Accounts';
+        $_REQUEST['action'] = 'DetailView';
+        $_REQUEST['record'] = $objAccount->id;
+        $_SERVER['REQUEST_METHOD'] = 'GET';
+        unset($GLOBALS['focus']);
+
+        $subpanels = new SubPanelDefinitions($objAccount, 'Accounts');
+        $subpanelDef = $subpanels->load_subpanel($this->relationship->getName().'accounts_ida');
+        $subpanel = new SubPanel('Accounts', $objAccount->id, 'default', $subpanelDef);
+        $subpanel->setTemplateFile('include/SubPanel/SubPanelDynamic.html');
+        $subpanel->display();
+        $actual = $this->getActualOutput();
+        $this->assertNotContains($this->parentAccount->name, $actual, 'Parent account name is displayed in subpanel of child aaccount');
+    }
+}
\ No newline at end of file
diff --git a/tests/data/Bug53963Test.php b/tests/data/Bug53963Test.php
new file mode 100755
index 00000000..14f404c8
--- /dev/null
+++ b/tests/data/Bug53963Test.php
@@ -0,0 +1,84 @@
+<?php
+
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+/**
+ * Bug #53963
+ * Primary keys/indexes missing for *_audit tables (DB2 only)
+ *
+ * @author fsteegmans@sugarcrm.com
+ * @ticked 53963
+ */
+class Bug53963Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    private $db;
+    private $bean;
+    private $audit_table_name;
+
+    public function setUp()
+    {
+        $this->db = $GLOBALS['db'];
+        $this->bean = new SugarBean();
+        $this->bean->table_name = 'Bug53963Test';
+        $this->audit_table_name = $this->bean->get_audit_table_name();
+        $this->cleanUpAuditTable();
+	}
+
+	public function tearDown()
+	{
+        $this->cleanUpAuditTable();
+	}
+
+    public function testAuditTablePrimaryKeyCreation()
+    {
+        function findPK($previous, $index){
+            return $previous || ($index['type'] == 'primary');
+        }
+        $this->bean->create_audit_table();
+        $indices = $this->db->get_indices($this->audit_table_name);
+        $this->assertNotEmpty($indices, "Audit table indices are missing!");
+        $this->assertTrue(array_reduce($indices, 'findPK'), "Audit table is missing a primary key index");
+    }
+
+    private function cleanUpAuditTable()
+    {
+        if ($this->db->tableExists($this->audit_table_name)) {
+            $this->db->dropTableName($this->audit_table_name);
+        }
+    }
+
+}
diff --git a/tests/data/GetLinkedBeansTest.php b/tests/data/GetLinkedBeansTest.php
index 6117e679..e1f05326 100755
--- a/tests/data/GetLinkedBeansTest.php
+++ b/tests/data/GetLinkedBeansTest.php
@@ -47,6 +47,12 @@ class GetLinkedBeansTest extends Sugar_PHPUnit_Framework_TestCase
         $GLOBALS['current_user']->setPreference('timezone', "America/Los_Angeles");
 	    $GLOBALS['current_user']->setPreference('datef', "m/d/Y");
 		$GLOBALS['current_user']->setPreference('timef', "h.iA");
+
+        $beanList = array();
+        $beanFiles = array();
+        require('include/modules.php');
+        $GLOBALS['beanList'] = $beanList;
+        $GLOBALS['beanFiles'] = $beanFiles;
 	}
 
 	public function tearDown()
@@ -61,6 +67,8 @@ class GetLinkedBeansTest extends Sugar_PHPUnit_Framework_TestCase
             if (is_file($file))
                 unlink($file);
         }
+
+        unset($GLOBALS['beanFiles'], $GLOBALS['beanList']);
 	}
 
     public function testGetLinkedBeans()
diff --git a/tests/data/Relationships/Bug52544Test.php b/tests/data/Relationships/Bug52544Test.php
new file mode 100755
index 00000000..221d697d
--- /dev/null
+++ b/tests/data/Relationships/Bug52544Test.php
@@ -0,0 +1,73 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+class Bug52544Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    /**
+     * @var User
+     */
+    protected $user1;
+
+    public function setUp()
+    {
+        $this->user1 = SugarTestUserUtilities::createAnonymousUser();
+        $user2 = SugarTestUserUtilities::createAnonymousUser();
+        $user2->reports_to_id = $this->user1->id;
+        $user2->save();
+        $user3 = SugarTestUserUtilities::createAnonymousUser();
+        $user3->reports_to_id = $this->user1->id;
+        $user3->save();
+    }
+
+    public function tearDown()
+    {
+        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+    }
+
+    public function testGetSubpanelQueryReturnsArray()
+    {
+        // Load up the relationship
+        if ( ! $this->user1->load_relationship('reportees') ) {
+            // The relationship did not load, I'm guessing it doesn't exist
+            $this->fail('Could not find a relationship named: reportees');
+        }
+        $linkQueryParts = $this->user1->reportees->getSubpanelQuery(array('return_as_array'=>true));
+
+        $this->assertTrue(is_array($linkQueryParts));
+    }
+
+}
\ No newline at end of file
diff --git a/tests/data/SugarBeanTest.php b/tests/data/SugarBeanTest.php
index 79f414ea..36438159 100755
--- a/tests/data/SugarBeanTest.php
+++ b/tests/data/SugarBeanTest.php
@@ -91,6 +91,33 @@ class SugarBeanTest extends Sugar_PHPUnit_Framework_TestCase
         $this->assertNotContains("select * from config", $bean->db->lastQuery);
     }
 
+
+
+
+    /**
+     * Test to make sure that when a bean is cloned it removes all loaded relationships so they can be recreated on
+     * the cloned copy if they are called.
+     *
+     * @group 51630
+     * @return void
+     */
+    public function testCloneBeanDoesntKeepRelationship()
+    {
+        $account = SugarTestAccountUtilities::createAccount();
+
+        $account->load_relationship('contacts');
+
+        // lets make sure the relationship is loaded
+        $this->assertTrue(isset($account->contacts));
+
+        $clone_account = clone $account;
+
+        // lets make sure that the relationship is not on the cloned record
+        $this->assertFalse(isset($clone_account->contacts));
+
+        SugarTestAccountUtilities::removeAllCreatedAccounts();
+    }
+
 }
 
 // Using Mssql here because mysql needs real connection for quoting
diff --git a/tests/include/MVC/Controller/SugarControllerTest.php b/tests/include/MVC/Controller/SugarControllerTest.php
index ddf7707b..a869a711 100755
--- a/tests/include/MVC/Controller/SugarControllerTest.php
+++ b/tests/include/MVC/Controller/SugarControllerTest.php
@@ -37,7 +37,7 @@
  
 require_once 'include/MVC/Controller/SugarController.php';
 
-class SugarControllerTest extends Sugar_PHPUnit_Framework_TestCase
+class SugarControllerTest extends Sugar_PHPUnit_Framework_OutputTestCase
 {
     public function setUp()
     {
diff --git a/tests/include/MVC/View/views/ViewNoAccessTest.php b/tests/include/MVC/View/views/ViewNoAccessTest.php
index d374fd13..496221a0 100755
--- a/tests/include/MVC/View/views/ViewNoAccessTest.php
+++ b/tests/include/MVC/View/views/ViewNoAccessTest.php
@@ -37,7 +37,7 @@
  
 require_once('include/MVC/View/views/view.noaccess.php');
 
-class ViewNoAccessTest extends Sugar_PHPUnit_Framework_TestCase
+class ViewNoAccessTest extends Sugar_PHPUnit_Framework_OutputTestCase
 {   
     public function testConstructor() 
 	{
@@ -49,15 +49,7 @@ class ViewNoAccessTest extends Sugar_PHPUnit_Framework_TestCase
 	public function testDisplay()
 	{
 	    $view = new ViewNoaccess;
-	    
-        ob_start();
         $view->display();
-        $output = ob_get_contents();
-        ob_end_clean();
-        
-        $this->assertEquals(
-            '<p class="error">Warning: You do not have permission to access this module.</p>',
-            $output
-            );
+        $this->expectedString('<p class="error">Warning: You do not have permission to access this module.</p>');
 	}
 }
\ No newline at end of file
diff --git a/tests/include/MVC/View/views/ViewVcardTest.php b/tests/include/MVC/View/views/ViewVcardTest.php
index 1a2c5789..377ce2bf 100755
--- a/tests/include/MVC/View/views/ViewVcardTest.php
+++ b/tests/include/MVC/View/views/ViewVcardTest.php
@@ -37,7 +37,7 @@
  
 require_once('include/MVC/View/views/view.vcard.php');
 
-class ViewVcardTest extends Sugar_PHPUnit_Framework_TestCase
+class ViewVcardTest extends Sugar_PHPUnit_Framework_OutputTestCase
 {   
     public function setUp()
     {
@@ -69,17 +69,8 @@ class ViewVcardTest extends Sugar_PHPUnit_Framework_TestCase
 	    $view = new ViewVcard;
 	    $view->bean = SugarTestContactUtilities::createContact();
 	    $view->module = 'Contacts';
-	    
-        ob_start();
         $view->display();
-        $output = ob_get_contents();
-        ob_end_clean();
-        
         SugarTestContactUtilities::removeAllCreatedContacts();
-        
-        $this->assertContains(
-            'BEGIN:VCARD',
-            $output
-            );
+        $this->expectOutputRegex('/BEGIN\:VCARD/');
 	}
 }
\ No newline at end of file
diff --git a/tests/include/SerializeEvilTest.php b/tests/include/SerializeEvilTest.php
index 5240506d..6f48d138 100755
--- a/tests/include/SerializeEvilTest.php
+++ b/tests/include/SerializeEvilTest.php
@@ -35,6 +35,7 @@
  ********************************************************************************/
 
 
+require_once("include/Sugarpdf/sugarpdf_config.php");
 require_once 'include/tcpdf/tcpdf.php';
 require_once 'include/SugarCache/SugarCacheFile.php';
 require_once 'modules/Import/sources/ImportFile.php';
diff --git a/tests/include/Smarty/plugins/FunctionSugarHelpTest.php b/tests/include/Smarty/plugins/FunctionSugarHelpTest.php
index 17c74daf..07228f80 100755
--- a/tests/include/Smarty/plugins/FunctionSugarHelpTest.php
+++ b/tests/include/Smarty/plugins/FunctionSugarHelpTest.php
@@ -42,9 +42,15 @@ class FunctionSugarHelpTest extends Sugar_PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
+        SugarTestHelper::setUp('app_strings');
         $this->_smarty = new Sugar_Smarty;
     }
-    
+
+    public function tearDown()
+    {
+        SugarTestHelper::tearDown();
+    }
+
     public function providerSpecialCharactersHandledInTextParameter()
     {
         return array(
diff --git a/tests/include/database/Bug52783Test.php b/tests/include/database/Bug52783Test.php
new file mode 100755
index 00000000..d5a81155
--- /dev/null
+++ b/tests/include/database/Bug52783Test.php
@@ -0,0 +1,109 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+require_once 'include/database/MssqlManager.php';
+
+/**
+ * 
+ * Test is used for testing returnOrderBy() through limitQuery() because returnOrderBy() is private
+ * In MSSQL we use a different way of limiting a query using TOP and ROW_NUMBER() OVER( ORDER BY ordering )
+ * the 'ordering' attribute is tested on correctness with this test
+ * 
+ * @author avucinic@sugarcrm.com
+ *
+ */
+class Bug52783Test extends Sugar_PHPUnit_Framework_TestCase
+{
+	private $_db;
+
+	public function setUp()
+	{
+		$this->_db = new MssqlManager();
+	}
+
+	public function tearDown()
+	{
+	}
+
+	/**
+	 * Test if returnOrderBy() inside limitQuery() method returns a valid MSSQL ordering column for use in OVER()
+	 * @dataProvider orderProvider
+	 */
+	public function testReturnOrderBy($sql, $expected)
+	{
+		$expected = strtolower($expected);
+		$result = strtolower($this->_db->limitQuery($sql, 21, 20, false, '', false));
+		$this->assertContains($expected, $result);
+	}
+
+	public function orderProvider()
+	{
+		return array(
+		0 => array(
+				"SELECT  contacts.id , LTRIM(RTRIM(ISNULL(contacts.first_name,'')+' '+ISNULL(contacts.last_name,''))) as name, contacts.first_name , contacts.last_name , contacts.salutation  , accounts.name account_name, jtl0.account_id account_id, contacts.title , contacts.phone_work  , LTRIM(RTRIM(ISNULL(jt1.first_name,'')+' '+ISNULL(jt1.last_name,''))) assigned_user_name , jt1.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod, contacts.date_entered , contacts.assigned_user_id  , sfav.id is_favorite  FROM contacts   LEFT JOIN  accounts_contacts jtl0 ON contacts.id=jtl0.contact_id AND jtl0.deleted=0
+				LEFT JOIN  accounts accounts ON accounts.id=jtl0.account_id AND accounts.deleted=0
+				AND accounts.deleted=0  LEFT JOIN  users jt1 ON contacts.assigned_user_id=jt1.id AND jt1.deleted=0
+				AND jt1.deleted=0 LEFT JOIN  sugarfavorites sfav ON sfav.module ='Contacts' AND sfav.record_id=contacts.id AND sfav.created_by='1' AND sfav.deleted=0  where contacts.deleted=0 ORDER BY name",
+			
+				"LTRIM(RTRIM(ISNULL(contacts.first_name,'')+' '+ISNULL(contacts.last_name,'')))"
+			),
+			1 => array(
+				"SELECT  contacts.id , LTRIM(RTRIM(ISNULL(contacts.first_name,'')+' '+ISNULL(contacts.last_name,''))) as name, contacts.first_name , contacts.last_name , contacts.salutation  , accounts.name account_name, jtl0.account_id account_id, contacts.title , contacts.phone_work  , LTRIM(RTRIM(ISNULL(jt1.first_name,'')+' '+ISNULL(jt1.last_name,''))) assigned_user_name , jt1.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod, contacts.date_entered , contacts.assigned_user_id  , sfav.id is_favorite  FROM contacts   LEFT JOIN  accounts_contacts jtl0 ON contacts.id=jtl0.contact_id AND jtl0.deleted=0
+				LEFT JOIN  accounts accounts ON accounts.id=jtl0.account_id AND accounts.deleted=0
+				AND accounts.deleted=0  LEFT JOIN  users jt1 ON contacts.assigned_user_id=jt1.id AND jt1.deleted=0
+				AND jt1.deleted=0 LEFT JOIN  sugarfavorites sfav ON sfav.module ='Contacts' AND sfav.record_id=contacts.id AND sfav.created_by='1' AND sfav.deleted=0  where contacts.deleted=0 ORDER BY name ASC",
+			
+				"LTRIM(RTRIM(ISNULL(contacts.first_name,'')+' '+ISNULL(contacts.last_name,'')))"
+			),
+			2 => array(
+				"SELECT  contacts.id , LTRIM(RTRIM(ISNULL(contacts.first_name,'')+' '+ISNULL(contacts.last_name,''))) as name, contacts.first_name , contacts.last_name , contacts.salutation  , accounts.name account_name, jtl0.account_id account_id, contacts.title , contacts.phone_work  , LTRIM(RTRIM(ISNULL(jt1.first_name,'')+' '+ISNULL(jt1.last_name,''))) assigned_user_name , jt1.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod, contacts.date_entered , contacts.assigned_user_id  , sfav.id is_favorite  FROM contacts   LEFT JOIN  accounts_contacts jtl0 ON contacts.id=jtl0.contact_id AND jtl0.deleted=0
+				LEFT JOIN  accounts accounts ON accounts.id=jtl0.account_id AND accounts.deleted=0
+				AND accounts.deleted=0  LEFT JOIN  users jt1 ON contacts.assigned_user_id=jt1.id AND jt1.deleted=0
+				AND jt1.deleted=0 LEFT JOIN  sugarfavorites sfav ON sfav.module ='Contacts' AND sfav.record_id=contacts.id AND sfav.created_by='1' AND sfav.deleted=0  where contacts.deleted=0 ORDER BY contacts.name ASC",
+			
+				"contacts.name"
+			),
+			3 => array(
+				"SELECT  contacts.id , ISNULL(contacts.last_name,''))) as name, contacts.first_name , contacts.last_name , contacts.salutation  , accounts.name account_name, jtl0.account_id account_id, contacts.title , contacts.phone_work  , LTRIM(RTRIM(ISNULL(jt1.first_name,'')+' '+ISNULL(jt1.last_name,''))) assigned_user_name , jt1.created_by assigned_user_name_owner  , 'Users' assigned_user_name_mod, contacts.date_entered , contacts.assigned_user_id  , sfav.id is_favorite  FROM contacts   LEFT JOIN  accounts_contacts jtl0 ON contacts.id=jtl0.contact_id AND jtl0.deleted=0
+				LEFT JOIN  accounts accounts ON accounts.id=jtl0.account_id AND accounts.deleted=0
+				AND accounts.deleted=0  LEFT JOIN  users jt1 ON contacts.assigned_user_id=jt1.id AND jt1.deleted=0
+				AND jt1.deleted=0 LEFT JOIN  sugarfavorites sfav ON sfav.module ='Contacts' AND sfav.record_id=contacts.id AND sfav.created_by='1' AND sfav.deleted=0  where contacts.deleted=0 ORDER BY name ASC",
+			
+				"ISNULL(contacts.last_name,'')))"
+			),
+		);
+	}
+}
diff --git a/tests/include/database/Bug53002Test.php b/tests/include/database/Bug53002Test.php
new file mode 100755
index 00000000..8dc1a4b5
--- /dev/null
+++ b/tests/include/database/Bug53002Test.php
@@ -0,0 +1,66 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+require_once 'include/database/DBManagerFactory.php';
+
+class Bug53002Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    private $_db;
+
+    public function setUp()
+    {
+        if(empty($this->_db)){
+            $this->_db = DBManagerFactory::getInstance();
+        }
+    }
+
+    public function tearDown()
+    {
+    }
+
+    public function test_order_by_amount()
+    {
+        $query = "SELECT * FROM opportunities ORDER BY amount ASC";
+        $this->_db->query($query);
+        // and make no error messages are asserted
+        $this->assertEmpty($this->_db->lastError(), "lastError should return false of the last legal query that is ordering by amount against opportunities");
+
+        $query = "SELECT * FROM opportunities ORDER BY amount_usdollar ASC";
+        $this->_db->query($query);
+        // and make no error messages are asserted
+        $this->assertEmpty($this->_db->lastError(), "lastError should return false of the last legal query that is ordering by amount_usdollar against opportunities");
+    }
+}
diff --git a/tests/include/database/DBManagerTest.php b/tests/include/database/DBManagerTest.php
index e892bf9f..1cb38103 100755
--- a/tests/include/database/DBManagerTest.php
+++ b/tests/include/database/DBManagerTest.php
@@ -2061,7 +2061,7 @@ class DBManagerTest extends Sugar_PHPUnit_Framework_TestCase
             //echo "$size\n";
             $this->_db->insertParams($tablename, $fielddefs, array('id' => $size, 'test' => $str, 'dummy' => $str));
 
-            $select = "SELECT test FROM $tablename WHERE id = '$size'";
+            $select = "SELECT test FROM $tablename WHERE id = '{$size}'";
             $strresult = $this->_db->getOne($select);
 
             $this->assertEquals(0, mb_strpos($str, $strresult));
@@ -2092,13 +2092,14 @@ class DBManagerTest extends Sugar_PHPUnit_Framework_TestCase
      */
     public function testDBGuidGeneration()
     {
-        $guids = array();
-        $sql = "SELECT {$this->_db->getGuidSQL()} {$this->_db->getFromDummyTable()}";
-        for($i = 0; $i < 1000; $i++)
-        {
-            $newguid = $this->_db->getOne($sql);
-            $this->assertFalse(in_array($newguid, $guids), "'$newguid' already existed in the array of GUIDs!");
-            $guids []= $newguid;
-        }
-    }
+
+		$guids = array();
+		$sql = "SELECT {$this->_db->getGuidSQL()} {$this->_db->getFromDummyTable()}";
+		for($i = 0; $i < 1000; $i++)
+		{
+			$newguid = $this->_db->getOne($sql);
+			$this->assertFalse(in_array($newguid, $guids), "'$newguid' already existed in the array of GUIDs!");
+			$guids []= $newguid;
+		}
+	}
 }
diff --git a/tests/include/utils/Bug33284_Test.php b/tests/include/utils/Bug33284_Test.php
index 640f16d8..22bf445d 100755
--- a/tests/include/utils/Bug33284_Test.php
+++ b/tests/include/utils/Bug33284_Test.php
@@ -64,7 +64,7 @@ class Bug33284_Test extends Sugar_PHPUnit_Framework_TestCase
         
         $test_string = 'The quick brown fox jumps over lazy dogs';
         $display_string = getTrackerSubstring($test_string);
-        $this->assertEquals(strlen($display_string), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters');
+        $this->assertEquals(strlen(from_html($display_string)), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters');
     }
     
     
@@ -78,12 +78,12 @@ class Bug33284_Test extends Sugar_PHPUnit_Framework_TestCase
         $sugar_config['tracker_max_display_length'] = $default_length;
         
         $display_string = getTrackerSubstring($test_string);  
-        $this->assertEquals(strlen($display_string), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters (default)');
+        $this->assertEquals(strlen(from_html($display_string)), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters (default)');
 
 		$test_string = '早前於美國完成民族音樂學博士學位回港後在大專院校的音樂系任教123456789';
         $display_string = getTrackerSubstring($test_string);
 
-        $this->assertEquals(mb_strlen($display_string, 'UTF-8'), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters (default)');    
+        $this->assertEquals(mb_strlen(from_html($display_string), 'UTF-8'), $default_length, 'Assert that the string length is equal to ' . $default_length . ' characters (default)');    
     }  
 }
 
diff --git a/tests/include/utils/CleanDirNameTest.php b/tests/include/utils/CleanDirNameTest.php
new file mode 100755
index 00000000..c2292248
--- /dev/null
+++ b/tests/include/utils/CleanDirNameTest.php
@@ -0,0 +1,54 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+
+ 
+require_once 'include//utils/file_utils.php';
+
+/**
+ * Tests function cleanDirName
+ * @author hqi
+ *
+ */
+class CleanDirNameTest extends Sugar_PHPUnit_Framework_TestCase
+{
+    public function testCleanDirName()
+    {
+        $dir = "./../../../dir\\";
+        $this->assertEquals(cleanDirName($dir), "dir");
+    }
+}
\ No newline at end of file
diff --git a/tests/metadata/Bug51105Test.php b/tests/metadata/Bug51105Test.php
new file mode 100755
index 00000000..43cba67f
--- /dev/null
+++ b/tests/metadata/Bug51105Test.php
@@ -0,0 +1,68 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+class Bug51105Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    public function setUp()
+    {
+        $GLOBALS['current_user'] = SugarTestUserUtilities::createAnonymousUser();
+    }
+
+    public function tearDown()
+    {
+        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+        unset($GLOBALS['current_user']);
+    }
+
+    public function testCheckEditViewHeaderTpl()
+    {
+        require_once 'include/EditView/SubpanelQuickCreate.php';
+        $view    = 'QuickCreate';
+        $error   = 'Unexpected headerTpl value';
+        $default = 'include/EditView/header.tpl';
+
+        // Test modules, known case Meetings is default
+        $module = 'Meetings';
+        $sqc = new SubpanelQuickCreate($module, $view, true);
+        $this->assertEquals($default, $sqc->ev->defs['templateMeta']['form']['headerTpl'], $error);
+
+        // Employees has a defined headerTpl
+        $module = 'Employees';
+        $sqc = new SubpanelQuickCreate($module, $view, true);
+        $this->assertEquals('modules/Users/tpls/EditViewHeader.tpl', $sqc->ev->defs['templateMeta']['form']['headerTpl'], $error);
+    }
+}
\ No newline at end of file
diff --git a/tests/modules/Administration/SugarSpriteBuilderTest.php b/tests/modules/Administration/SugarSpriteBuilderTest.php
index ec384e07..9898821e 100755
--- a/tests/modules/Administration/SugarSpriteBuilderTest.php
+++ b/tests/modules/Administration/SugarSpriteBuilderTest.php
@@ -53,6 +53,10 @@ public function setUp()
         $this->markTestSkipped('imagecreatetruecolor function not found.  skipping test');
         return;
     }
+    if (empty($GLOBALS['sugar_config']['use_sprites']))
+    {
+        $GLOBALS['sugar_config']['use_sprites'] = null;
+    }
 
     $this->useSprites = $GLOBALS['sugar_config']['use_sprites'];
     $GLOBALS['sugar_config']['use_sprites'] = true;
diff --git a/tests/modules/Configurator/ConfiguratorTest.php b/tests/modules/Configurator/ConfiguratorTest.php
index 3ceae6c5..81d7fb1b 100755
--- a/tests/modules/Configurator/ConfiguratorTest.php
+++ b/tests/modules/Configurator/ConfiguratorTest.php
@@ -54,6 +54,6 @@ class ConfiguratorTest extends Sugar_PHPUnit_Framework_TestCase
         $this->assertEquals($cfg->config['admin_export_only'], false);
         $this->assertEquals($cfg->config['upload_dir'], 'yummy');
         
-        unset($_POST);
+        $_POST = array();
     }
 }
diff --git a/tests/modules/DynamicFields/Bug51427Test.php b/tests/modules/DynamicFields/Bug51427Test.php
new file mode 100755
index 00000000..085f35cd
--- /dev/null
+++ b/tests/modules/DynamicFields/Bug51427Test.php
@@ -0,0 +1,254 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+
+require_once("modules/ModuleBuilder/parsers/StandardField.php");
+require_once("modules/DynamicFields/FieldCases.php");
+
+
+/**
+ *  Bug #51427: Setting a "name" field to calculated removes it from Global Search
+ *
+ *  StandardField class didn't have functionality for checking `unified_search`
+ *  option. `unified_search` was always `false` for non-custom fields.
+ */
+
+class Bug51427Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    private $old_dictionary;
+    private $old_bean_list;
+    private $bean_name;
+    private $test_field;
+    private $test_standart_field;
+
+    public function setUp()
+    {
+        global $dictionary, $bean_list;
+
+        $this->old_dictionary=$dictionary;
+        $this->old_bean_list=$bean_list;
+        $this->test_standart_field = new TestStandardField();
+        $this->test_standart_field->module='Accounts';
+        loadBean($this->test_standart_field->module);
+        $this->test_field=get_widget('varchar');
+        $this->test_field->name='name';
+        $this->bean_name = get_valid_bean_name($this->test_standart_field->module);
+    }
+
+    public function tearDown()
+    {
+        global $dictionary, $bean_list;
+
+        $dictionary=$this->old_dictionary;
+        $bean_list=$this->old_bean_list;
+        VardefManager::clearVardef('Accounts', 'Account');
+        VardefManager::refreshVardefs('Accounts', 'Account');
+    }
+
+    /**
+     * Test different combinations of the options
+     *
+     * @dataProvider providerUnifiedSearchOptions
+     */
+    public function testIfUnifiedSearchEnabledByDefault(array $opt_common, array $opt_field, $assert)
+    {
+        $this->test_field->unified_search=false;
+        $this->setOptions($opt_common, $opt_field);
+        $this->test_standart_field->addFieldObject($this->test_field);
+        $this->assertEquals($assert,(boolean)$this->test_field->unified_search,
+                "\r\n"
+                .'Assertion error: field->unified_search should be `'.($assert ? 'true' : 'false').'` with the following vardef options:'
+
+                ."\r\nvardef[<module>][unified_search_default_enabled] "
+                    .($opt_common['unified_search_default_enabled']===-1 ? 'is undefined' : ($opt_common['unified_search_default_enabled'] ? '= true' : '= false'))
+
+                ."\r\nvardef[<module>][unified_search] "
+                    .($opt_common['unified_search']===-1 ? 'is undefined' : ($opt_common['unified_search'] ? '= true' : '= false'))
+
+                ."\r\nvardef[<module>][fields][<field_name>][unified_search] "
+                    .($opt_field['unified_search']===-1 ? 'is undefined' : ($opt_field['unified_search'] ? '= true' : '= false'))
+                ."\r\n"
+        );
+    }
+
+    public function providerUnifiedSearchOptions()
+    {
+        return array(
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>1,
+                    'unified_search'=>1,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>true,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>0,
+                    'unified_search'=>1,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>0,
+                    'unified_search'=>0,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>0,
+                    'unified_search'=>0,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>0,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>0,
+                    'unified_search'=>1,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>0,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>0,
+                    'unified_search'=>0,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>1,
+                    'unified_search'=>1,
+                ),
+                'options_field'=>array(
+                     'unified_search'=>-1,
+                ),
+                'assert'=>true,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>1,
+                    'unified_search'=>-1,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>false,
+            ),
+            array(
+                'options_common'=>array(
+                    'unified_search_default_enabled'=>-1,
+                    'unified_search'=>1,
+                ),
+                'options_field'=>array(
+                    'unified_search'=>1,
+                ),
+                'assert'=>false,
+            ),
+        );
+    }
+
+    private function setOptions(array $opt_common, array $opt_field)
+    {
+        global $dictionary;
+        $dictionary=$this->old_dictionary;
+        if(!empty($opt_common))
+        {
+            foreach($opt_common as $k=>$v)
+            {
+                if($v===-1)
+                {
+                    unset($dictionary[$this->bean_name][$k]);
+                }
+                else
+                {
+                    $dictionary[$this->bean_name][$k]=$v;
+                }
+            }
+        }
+        if(!empty($opt_field))
+        {
+            foreach($opt_field as $k=>$v)
+            {
+                if($v===-1)
+                {
+                    unset($dictionary[$this->bean_name]['fields'][$this->test_field->name][$k]);
+                }
+                else
+                {
+                    $dictionary[$this->bean_name]['fields'][$this->test_field->name][$k]=$v;
+                }
+            }
+        }
+    }
+}
+
+
+/*
+ * inherits StandardField
+ * some methods aren't used in the test
+ */
+class TestStandardField extends StandardField
+{
+    function writeVardefExtension()
+    {
+    }
+
+    function loadCustomDef()
+    {
+        $this->custom_def=array();
+    }
+}
\ No newline at end of file
diff --git a/tests/modules/DynamicFields/templates/Fields/Bug52610Test.php b/tests/modules/DynamicFields/templates/Fields/Bug52610Test.php
new file mode 100755
index 00000000..a517ca0f
--- /dev/null
+++ b/tests/modules/DynamicFields/templates/Fields/Bug52610Test.php
@@ -0,0 +1,81 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+require_once 'modules/DynamicFields/FieldCases.php';
+
+/**
+ * Bug #52610
+ * [MSSQL]: Cannot add checkbox field in Studio
+ *
+ * @author mgusev@sugarcrm.com
+ * @ticked 52610
+ */
+class Bug52610Test extends Sugar_PHPUnit_Framework_TestCase
+{
+
+    /**
+     * @return array of default values for test
+     */
+    public function getDefaults()
+    {
+        return array(
+            array(true),
+            array(''),
+            array('string'),
+            array(123),
+            array(123.45)
+        );
+    }
+
+    /**
+     * Test gets query for boolean field which should not contains default part
+     * @dataProvider getDefaults
+     * @group 52610
+     * @return void
+     */
+    public function testDefaultInQuery($default)
+    {
+        $field = get_widget('bool');
+        $field->name = 'bug52610_c';
+        $field->type = 'bool';
+        $field->default = $default;
+        $field->default_value = '';
+        $field->no_default = 1;
+        $query = $field->get_db_add_alter_table('bug52610_cstm');
+        $this->assertNotContains(" DEFAULT ", $query, "DEFAULT part is present in query");
+    }
+}
diff --git a/tests/modules/Emails/BugNullAssignedUserIdTest.php b/tests/modules/Emails/BugNullAssignedUserIdTest.php
new file mode 100755
index 00000000..51857937
--- /dev/null
+++ b/tests/modules/Emails/BugNullAssignedUserIdTest.php
@@ -0,0 +1,95 @@
+<?php 
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+ 
+require_once('modules/Emails/Email.php');
+
+/**
+ * Test case for Bugs 50972, 50973 and 50979
+ */
+class BugNullAssignedUserIdTest extends Sugar_PHPUnit_Framework_TestCase
+{
+    private $old_current_user;
+    private $current_user;
+    private $email;
+	
+	public function setUp()
+	{
+	    global $current_user;
+        
+        if (!empty($current_user)) {
+            $this->old_current_user = $current_user;
+        }
+		
+	    $this->current_user = SugarTestUserUtilities::createAnonymousUser();
+        
+        $GLOBALS['current_user'] = $this->current_user;
+	    $this->email = new Email();
+	    $this->email->email2init();
+
+        // Set some values for some fields so the query is actually built
+        $this->email->id = '1';
+        $this->email->created_by = $this->current_user->id;
+        $this->email->date_modified = date('Y-m-d H:i:s');
+
+        // Specify an empty assigned user id for testing nulls
+        $this->email->assigned_user_id = '';
+	}
+	
+	public function tearDown()
+	{
+		unset($this->email);
+		SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+		unset($this->current_user);
+        
+        if ($this->old_current_user) {
+            $GLOBALS['current_user'] = $this->old_current_user;
+        }
+	}
+
+    public function testNullAssignedUserIdConvertedToEmptyInSave() {
+        $query = $this->email->db->updateSQL($this->email);
+        $this->assertContains("assigned_user_id=''", $query, 'Assigned user id set to empty string not found');
+    }
+
+    public function testNullAssignedUserIdInSave() {
+        $this->email->setFieldNullable('assigned_user_id');
+        $query = $this->email->db->updateSQL($this->email);
+        $this->email->revertFieldNullable('assigned_user_id');
+        $this->assertContains('assigned_user_id=NULL', $query, 'Assigned user id set to DB NULL value not found');
+    }
+}
+?>
\ No newline at end of file
diff --git a/tests/modules/InboundEmail/Bug43554Test.php b/tests/modules/InboundEmail/Bug43554Test.php
index 5b1ad165..40184f5b 100755
--- a/tests/modules/InboundEmail/Bug43554Test.php
+++ b/tests/modules/InboundEmail/Bug43554Test.php
@@ -63,13 +63,13 @@ class Bug43554Test extends Sugar_PHPUnit_Framework_TestCase
     public function getUrls()
     {
         return array(
-            array("http://localhost:8888/sugarent/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", TRUE),
-            array("http://localhost:8888/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", TRUE),
-            array(to_html("http://localhost:8888/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"), TRUE),
-            array("/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", TRUE),
-            array("index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", FALSE),
-            array("/?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", TRUE),
-            array("https://localhost/?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1", TRUE),
+            array("http://localhost:8888/sugarent/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
+            array("http://localhost:8888/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
+            array(to_html("http://localhost:8888/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1")),
+            array("/index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
+            array("index.php?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
+            array("/?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
+            array("https://localhost/?composeLayoutId=composeLayout1&fromAccount=1&module=Emails&action=EmailUIAjax&emailUIAction=sendEmail&setEditor=1"),
             );
     }
 
@@ -77,17 +77,10 @@ class Bug43554Test extends Sugar_PHPUnit_Framework_TestCase
      * @dataProvider getUrls
      * @param string $url
      */
-	function testEmailCleanup($url,$imgShouldBeRemoved)
+	function testEmailCleanup($url)
 	{
         $data = "Test: <img src=\"$url\">";
-        if($imgShouldBeRemoved)
-        {
-            $res = str_replace("<img />", "", SugarCleaner::cleanHtml($data));
-            $this->assertNotContains("<img", $res);
-        }
-        else
-        {
-            $this->assertContains("<img", SugarCleaner::cleanHtml($data));
-        }
+        $res = str_replace("<img />", "", SugarCleaner::cleanHtml($data));
+        $this->assertNotContains("<img", $res);
 	}
 }
\ No newline at end of file
diff --git a/tests/modules/Leads/Bug44522Test.php b/tests/modules/Leads/Bug44522Test.php
index 39b9b570..d1b5c0d1 100755
--- a/tests/modules/Leads/Bug44522Test.php
+++ b/tests/modules/Leads/Bug44522Test.php
@@ -35,7 +35,7 @@
  ********************************************************************************/
 
  
-class Bug44522Test extends Sugar_PHPUnit_Framework_TestCase
+class Bug44522Test extends Sugar_PHPUnit_Framework_OutputTestCase
 {
     var $user;
     var $account;
@@ -89,8 +89,6 @@ class Bug44522Test extends Sugar_PHPUnit_Framework_TestCase
     //run test to make sure there is an entry in campaign_log table for newly created contact during lead conversion (bug 44522)
     public function testConvertContactInCampaignLog()
     {
-        //there will be output from display function, so call ob_start to trap it
-        ob_start();
 
         $_POST = array();
         
@@ -125,6 +123,5 @@ class Bug44522Test extends Sugar_PHPUnit_Framework_TestCase
         }
         
         $this->assertEquals($contact_id, $test_contact_id);
-        $output = ob_get_clean();
     }
 }
\ No newline at end of file
diff --git a/tests/modules/Leads/ConvertLeadTests.php b/tests/modules/Leads/ConvertLeadTests.php
index cc1eba20..2ec4da31 100755
--- a/tests/modules/Leads/ConvertLeadTests.php
+++ b/tests/modules/Leads/ConvertLeadTests.php
@@ -35,6 +35,7 @@
  ********************************************************************************/
 
 
+require_once('tests/SugarTestViewConvertLeadUtilities.php');
 require_once 'modules/Leads/views/view.convertlead.php';
 require_once 'tests/SugarTestViewConvertLeadUtilities.php';
 
@@ -150,7 +151,45 @@ class ConvertLeadTests extends Sugar_PHPUnit_Framework_TestCase
         SugarTestLeadUtilities::removeAllCreatedLeads();
     }
 
-    public function testActivityCopy() {
+
+    public function testActivityCopyWithParent() {
+        // lets the run the activity copy again, only this time we pass in a parent account
+        $lead = SugarTestLeadUtilities::createLead();
+        $contact = SugarTestContactUtilities::createContact();
+        $meeting = SugarTestMeetingUtilities::createMeeting();
+        $account = SugarTestAccountUtilities::createAccount();
+        SugarTestMeetingUtilities::addMeetingParent($meeting->id, $lead->id);
+                $relation_id = SugarTestMeetingUtilities::addMeetingLeadRelation($meeting->id, $lead->id);
+        $_REQUEST['record'] = $lead->id;
+
+        // refresh the meeting to include parent_id and parent_type
+        $meeting_id = $meeting->id;
+        $meeting = new Meeting();
+        $meeting->retrieve($meeting_id);
+
+        // action: copy meeting from lead to contact
+        $convertObj = new TestViewConvertLead();
+        $convertObj->copyActivityWrapper($meeting, $contact, array('id'=>$account->id,'type'=>'Accounts'));
+
+
+        // 2a a newly created meeting with no parent info passed in, so parent id and type are empty
+        //parent type=Contatcs and parent_id=$contact->id
+        //$sql = "select id from meetings where parent_id='{$contact->id}' and parent_type= 'Contacts' and deleted=0";
+        $sql = "select id, parent_id from meetings where name = '{$meeting->name}'";
+        $result = $GLOBALS['db']->query($sql);
+        while ($row = $GLOBALS['db']->fetchByAssoc($result)){
+            //skip if this is the original message
+            if($row['id'] == $meeting_id){
+                continue;
+            }
+
+            $this->assertEquals($row['parent_id'], $account->id, 'parent id of meeting should be equal to passed in account id: '.$account->id);
+        }
+
+    }
+
+    
+    public function testActivityCopyWithNoParent() {
         // init
         $lead = SugarTestLeadUtilities::createLead();
         $contact = SugarTestContactUtilities::createContact();
@@ -173,15 +212,20 @@ class ConvertLeadTests extends Sugar_PHPUnit_Framework_TestCase
         $this->assertEquals('Leads', $meeting->parent_type, 'parent_type of the original meeting was changed from Leads to '.$meeting->parent_type);
         $this->assertEquals($lead->id, $meeting->parent_id, 'parent_id of the original meeting was changed from '.$lead->id.' to '.$meeting->parent_id);
 
-        // 2. a newly created meeting with parent type=Contatcs and parent_id=$contact->id
-        $sql = "select id from meetings where parent_id='{$contact->id}' and parent_type= 'Contacts' and deleted=0";
-        $result = $GLOBALS['db']->query($sql);
-        $row = $GLOBALS['db']->fetchByAssoc($result);
-        $this->assertNotNull($row, 'Could not find the newly created meeting with parent_type=Contacts and parent_id='.$contact->id);
+        // 2. a newly created meeting with no parent info passed in, so parent id and type are empty
         $new_meeting_id = '';
-        if ($row) {
-            $new_meeting_id = $row['id'];
-        }
+        $sql = "select id, parent_id from meetings where name = '{$meeting->name}'";
+              $result = $GLOBALS['db']->query($sql);
+              while ($row = $GLOBALS['db']->fetchByAssoc($result)){
+                  //skip if this is the original message
+                  if($row['id'] == $meeting_id){
+                      continue;
+                  }
+                  $new_meeting_id = $row['id'];
+                  $this->assertEmpty($row['parent_id'],'parent id of meeting should be empty as no parent was sent in ');
+              }
+
+
 
         // 3. record should not be deleted from meetings_leads table
         $sql = "select id from meetings_leads where meeting_id='{$meeting->id}' and lead_id='{$lead->id}' and deleted=0";
@@ -342,18 +386,18 @@ class ConvertLeadTests extends Sugar_PHPUnit_Framework_TestCase
         $row = $GLOBALS['db']->fetchByAssoc($result);
         $this->assertFalse(empty($row), "Meeting-Contact relationship is not added.");
 
-        // 7. the parent_type of the new meeting should be Contacts
+        // 7. the parent_type of the new meeting should be empty
         $new_meeting_id = $row['meeting_id'];
         $sql = "select id, parent_type, parent_id from meetings where id='{$new_meeting_id}' and deleted=0";
         $result = $GLOBALS['db']->query($sql);
         $row = $GLOBALS['db']->fetchByAssoc($result);
         $this->assertFalse(empty($row), "New meeting is not added for contact.");
-        $this->assertEquals('Contacts', $row['parent_type'], 'Parent type of the new meeting should be Contacts');
+        $this->assertEmpty($row['parent_type'], 'Parent type of the new meeting should be Empty');
 
         // 8. the parent_id of the new meeting should be contact id
-        $this->assertEquals($contact_id, $row['parent_id'], 'Parent id of the new meeting should be contact id.');
+        $this->assertEmpty($row['parent_id'], 'Parent id of the new meeting should be empty.');
 
-        // clean up
+       // clean up
         unset($_REQUEST['record']);
         $GLOBALS['db']->query("delete from meetings where parent_id='{$lead->id}' and parent_type= 'Leads'");
         $GLOBALS['db']->query("delete from meetings where parent_id='{$contact_id}' and parent_type= 'Contacts'");
@@ -466,8 +510,8 @@ class TestViewConvertLead extends ViewConvertLead
         parent::moveActivity($activity, $bean);
     }
 
-    public function copyActivityWrapper($activity, $bean) {
-        parent::copyActivityAndRelateToBean($activity, $bean);
+    public function copyActivityWrapper($activity, $bean,$parent=array()) {
+        parent::copyActivityAndRelateToBean($activity, $bean,$parent);
     }
 
     public function testMeetingsUsersRelationships()
diff --git a/tests/modules/MassUpdate/Bug51596Test.php b/tests/modules/MassUpdate/Bug51596Test.php
index e79c8ea1..16bf8a91 100755
--- a/tests/modules/MassUpdate/Bug51596Test.php
+++ b/tests/modules/MassUpdate/Bug51596Test.php
@@ -41,25 +41,26 @@
 class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
 {
     /**
-* @var Contact
-*/
+    * @var Contact
+    */
     protected $contact1,
         $contact2;
 
     /**
-* @var Account
-*/
+     * @var Account
+     * @var Account
+     */
     protected $account1,
         $account2;
 
     protected $field_name = 'bug51596test';
 
     /**
-* Sets up the fixture, for example, open a network connection.
-* This method is called before a test is executed.
-*
-* @return void
-*/
+    * Sets up the fixture, for example, open a network connection.
+    * This method is called before a test is executed.
+    *
+    * @return void
+    */
     public function setUp()
     {
         $this->markTestIncomplete("Disabling broken test on CI. Working with Sergei to get it fixed");
@@ -71,15 +72,15 @@ class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
             'Contact' => array(
                 'fields' => array(
                     $this->field_name => array (
-                        'name' => $this->field_name,
-                        'rname' => 'name',
-                        'id_name' => 'account_id',
+                        'name'      => $this->field_name,
+                        'rname'     => 'name',
+                        'id_name'   => 'account_id',
                         'join_name' => 'accounts',
-                        'type' => 'relate',
-                        'link' => 'accounts',
-                        'table' => 'accounts',
-                        'module' => 'Accounts',
-                        'source' => 'non-db',
+                        'type'      => 'relate',
+                        'link'      => 'accounts',
+                        'table'     => 'accounts',
+                        'module'    => 'Accounts',
+                        'source'    => 'non-db',
                     ),
                 ),
             ),
@@ -118,17 +119,17 @@ class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
 
         // will update "do_not_call" attribute of found contacts
         $_REQUEST['massupdate'] = 'true';
-        $_REQUEST['entire'] = true;
-        $_REQUEST['module'] = 'Contacts';
-        $_POST['do_not_call'] = 1;
+        $_REQUEST['entire']     = true;
+        $_REQUEST['module']     = 'Contacts';
+        $_POST['do_not_call']   = 1;
     }
 
     /**
-* Tears down the fixture, for example, close a network connection.
-* This method is called after a test is executed.
-*
-* @return void
-*/
+     * Tears down the fixture, for example, close a network connection.
+     * This method is called after a test is executed.
+     *
+     * @return void
+     */
     public function tearDown()
     {
         unset($_REQUEST['massupdate'], $_REQUEST['entire'], $_REQUEST['module'], $_POST['do_not_call']);
@@ -159,11 +160,11 @@ class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
     }
 
     /**
-* Verifies that objects are found and updated by name of custom related
-* object
-*
-* @return void
-*/
+     * Verifies that objects are found and updated by name of custom related
+     * object
+     *
+     * @return void
+     */
     public function testSearchAndUpdate()
     {
         $contact = new Contact();
@@ -174,7 +175,7 @@ class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
 
         // search for contacts related to Bug51596Test_Account1 (e.g. Contact1)
         $current_query_by_page = array (
-            'searchFormTab' => 'basic_search',
+            'searchFormTab'              => 'basic_search',
             $this->field_name . '_basic' => 'Bug51596Test_Account1',
         );
 
@@ -193,14 +194,14 @@ class Bug51596Test extends Sugar_PHPUnit_Framework_TestCase
     }
 
     /**
-* Utility function. Registers vardef extension for specified module.
-*
-* @static
-* @param string $module
-* @param string $filename
-* @param array $data
-* @return void
-*/
+     * Utility function. Registers vardef extension for specified module.
+     *
+     * @static
+     * @param string $module
+     * @param string $filename
+     * @param array $data
+     * @return void
+     */
     protected static function registerExtension($module, $filename, array $data)
     {
         $directory = 'custom/Extension/modules/' . $module . '/Ext/Vardefs';
@@ -224,13 +225,13 @@ HERE;
     }
 
     /**
-* Utility function. Unregisters vardef extension for specified module.
-*
-* @static
-* @param string $module
-* @param string $filename
-* @return void
-*/
+     * Utility function. Unregisters vardef extension for specified module.
+     *
+     * @static
+     * @param string $module
+     * @param string $filename
+     * @return void
+     */
     protected static function unregisterExtension($module, $filename)
     {
         $directory = 'custom/Extension/modules/' . $module . '/Ext/Vardefs';
@@ -247,15 +248,16 @@ HERE;
     }
 
     /**
-* Utility function. Rebuilds extensions for specified module.
-*
-* @static
-* @param string $module
-* @return void
-*/
+     * Utility function. Rebuilds extensions for specified module.
+     *
+     * @static
+     * @param string $module
+     * @return void
+     */
     protected static function rebuildExtensions($module)
     {
         $rc = new RepairAndClear();
         $rc->repairAndClearAll(array('rebuildExtensions'), array($module), false, false);
     }
-}
\ No newline at end of file
+
+}
diff --git a/tests/modules/ModuleBuilder/Bug52063Test.php b/tests/modules/ModuleBuilder/Bug52063Test.php
index 808cfbcd..156a64fd 100755
--- a/tests/modules/ModuleBuilder/Bug52063Test.php
+++ b/tests/modules/ModuleBuilder/Bug52063Test.php
@@ -134,8 +134,8 @@ class Bug52063Test extends Sugar_PHPUnit_Framework_TestCase
         unset($GLOBALS['beanList']);
         unset($GLOBALS['beanFiles']);
         unset($GLOBALS['app_list_strings']);
-        unset($_REQUEST);
-
+        $_REQUEST = array();
+        SugarCache::$isCacheReset = false;
     }
 
     /**
diff --git a/tests/modules/ModuleBuilder/MB/Bug40299Test.php b/tests/modules/ModuleBuilder/MB/Bug40299Test.php
new file mode 100755
index 00000000..cd0444c2
--- /dev/null
+++ b/tests/modules/ModuleBuilder/MB/Bug40299Test.php
@@ -0,0 +1,65 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+
+/**
+ * Bug 40299 - Editing Stock Fields Causes SQL Errors After Custom Module Is Deployed
+ */
+require_once 'modules/ModuleBuilder/MB/MBModule.php';
+
+class Bug40299Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    var $MBModule;
+    
+    public function setUp()
+	{
+	    $GLOBALS['current_user'] = SugarTestUserUtilities::createAnonymousUser();
+        $this->MBModule = new MBModule('testModule', 'custom/modulebuilder/packages/testPkg', 'testPkg', 'testPkg');
+	}
+	
+	public function tearDown()
+	{
+		SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
+		unset($GLOBALS['current_user']);
+        $this->MBModule->delete();
+	}
+    
+    public function testFieldExistForBasicFields()
+    {
+        $this->assertEquals(true, $this->MBModule->fieldExists('name'));
+    }
+}
\ No newline at end of file
diff --git a/tests/modules/Project/Bug37123Test.php b/tests/modules/Project/Bug37123Test.php
index 6cb55db7..e4426764 100755
--- a/tests/modules/Project/Bug37123Test.php
+++ b/tests/modules/Project/Bug37123Test.php
@@ -40,10 +40,9 @@ class Bug37123Test extends Sugar_PHPUnit_Framework_TestCase
 {
     public function setUp()
     {
-        global $current_user, $currentModule ;
-        global $beanList;
-        require('include/modules.php');
-        $current_user = SugarTestUserUtilities::createAnonymousUser();
+        SugarTestHelper::setUp('beanFiles');
+        SugarTestHelper::setUp('beanList');
+        SugarTestHelper::setUp('current_user');
         $unid = uniqid();
         $time = date('Y-m-d H:i:s');
 
@@ -97,10 +96,6 @@ class Bug37123Test extends Sugar_PHPUnit_Framework_TestCase
 
     public function tearDown()
     {
-        SugarTestUserUtilities::removeAllCreatedAnonymousUsers();
-        unset($GLOBALS['current_user']);
-        unset($GLOBALS['mod_strings']);
-
         $GLOBALS['db']->query("DELETE FROM contacts WHERE id= '{$this->contact->id}'");
         $GLOBALS['db']->query("DELETE FROM accounts WHERE id = '{$this->account->id}'");
         $GLOBALS['db']->query("DELETE FROM accounts_contacts WHERE id = '{$this->ac_id}'");
@@ -113,8 +108,9 @@ class Bug37123Test extends Sugar_PHPUnit_Framework_TestCase
         unset($this->ac_id);
         unset($GLOBALS['relate_id']);
         unset($GLOBALS['relate_to']);
+        SugarTestHelper::tearDown();
     }
 
 
 
-}
\ No newline at end of file
+}
diff --git a/tests/modules/Reports/Bug36246Test.php b/tests/modules/Reports/Bug36246Test.php
index 048a4b63..976cb0e6 100755
--- a/tests/modules/Reports/Bug36246Test.php
+++ b/tests/modules/Reports/Bug36246Test.php
@@ -56,4 +56,4 @@ class SugarWidgetFieldURLBug36246Mock extends SugarWidgetFieldURL {
     {
         return 'sugarcrm.com';
     }
-}
\ No newline at end of file
+}
diff --git a/tests/modules/SchedulersJobs/SchedulersJobsTest.php b/tests/modules/SchedulersJobs/SchedulersJobsTest.php
index 42edee11..2eb9f661 100755
--- a/tests/modules/SchedulersJobs/SchedulersJobsTest.php
+++ b/tests/modules/SchedulersJobs/SchedulersJobsTest.php
@@ -491,6 +491,46 @@ class SchedulersJobsTest extends Sugar_PHPUnit_Framework_TestCase
         $this->scheduler->retrieve($this->scheduler->id);
         $this->assertNotEmpty($this->scheduler->last_run, "Last run was not updated");
     }
+
+    public function testCleanupJobs()
+    {
+        $GLOBALS['current_user'] = SugarTestUserUtilities::createAnonymousUser();
+        $this->scheduler = new Scheduler(false);
+        $this->scheduler->id = create_guid();
+        $newjob = $this->createJob(array("name" => "Test Func", "status" => SchedulersJob::JOB_STATUS_DONE,
+        		"target" => "function::testJobFunction1", "assigned_user_id" => $GLOBALS['current_user']->id,
+        		"scheduler_id" => $this->scheduler->id));
+        $oldjob = $this->createJob(array("name" => "Test Func", "status" => SchedulersJob::JOB_STATUS_DONE,
+        		"target" => "function::testJobFunction1", "assigned_user_id" => $GLOBALS['current_user']->id,
+        		"scheduler_id" => $this->scheduler->id, 'update_date_modified' => false,
+                'date_modified' => TimeDate::getInstance()->getNow()->modify("-10 days")->asDB()));
+        $oldestjob = $this->createJob(array("name" => "Test Func", "status" => SchedulersJob::JOB_STATUS_DONE,
+        		"target" => "function::testJobFunction1", "assigned_user_id" => $GLOBALS['current_user']->id,
+        		"scheduler_id" => $this->scheduler->id, 'update_date_modified' => false,
+                'date_modified' => TimeDate::getInstance()->getNow()->modify("-100 days")->asDb()));
+
+        $this->assertNotEmpty($newjob->id);
+        $this->assertNotEmpty($oldjob->id);
+        $this->assertNotEmpty($oldestjob->id);
+
+        $cleanjob = $this->createJob(array("name" => "Test Func", "status" => SchedulersJob::JOB_STATUS_RUNNING,
+        		"target" => "function::cleanJobQueue", "assigned_user_id" => $GLOBALS['current_user']->id,
+        		"scheduler_id" => $this->scheduler->id));
+        $cleanjob->runJob();
+        // new job should be still there
+        $job = new SchedulersJob();
+        $job->retrieve($newjob->id);
+        $this->assertEquals($newjob->id, $job->id);
+        // old job should be deleted
+        $job = new SchedulersJob();
+        $job->retrieve($oldjob->id);
+        $this->assertEmpty($job->id);
+        $job->retrieve($oldjob->id, true, false);
+        $this->assertEquals($oldjob->id, $job->id);
+        // oldest job should be purged
+        $count = $this->db->getOne("SELECT count(*) from {$job->table_name} WHERE id='{$oldestjob->id}'");
+        $this->assertEquals(0, $count);
+    }
 }
 
 class TestSchedulersJob extends SchedulersJob
diff --git a/tests/modules/UpgradeWizard/Bug46028Test.php b/tests/modules/UpgradeWizard/Bug46028Test.php
index 60d5c53f..670ef943 100755
--- a/tests/modules/UpgradeWizard/Bug46028Test.php
+++ b/tests/modules/UpgradeWizard/Bug46028Test.php
@@ -53,6 +53,11 @@ var $opportunitiesSearchFields;
 
 public function setUp()
 {
+    $beanList = array();
+    $beanFiles = array();
+    require('include/modules.php');
+    $GLOBALS['beanList'] = $beanList;
+    $GLOBALS['beanFiles'] = $beanFiles;
     if(file_exists('custom/modules/Opportunities/metadata/SearchFields.php'))
     {
         $this->customOpportunitiesSearchFields = file_get_contents('custom/modules/Opportunities/metadata/SearchFields.php');
diff --git a/tests/modules/Users/authentication/SAMLAuthenticate/Bug49069Test.php b/tests/modules/Users/authentication/SAMLAuthenticate/Bug49069Test.php
index 488202ba..2d07e06b 100755
--- a/tests/modules/Users/authentication/SAMLAuthenticate/Bug49069Test.php
+++ b/tests/modules/Users/authentication/SAMLAuthenticate/Bug49069Test.php
@@ -88,15 +88,6 @@ class Bug49069Test extends  Sugar_PHPUnit_Framework_TestCase
             'Location: index.php?module=foo&action=bar&record=123',
             $url
             );
-
-
-        $this->assertTrue(!empty($_REQUEST['user_name']), 'Assert that we automatically set a user_name in $_REQUEST');
-        $this->assertEquals('onelogin', $_REQUEST['user_name']);
-        $this->assertTrue(!empty($_REQUEST['user_password']), 'Assert that we automatically set a user_password in $_REQUEST');
-        $this->assertEquals('onelogin', $_REQUEST['user_password']);
-
-
-
     }
 
     public function testDefaultUserNamePasswordSet()
@@ -123,4 +114,4 @@ class Bug49069Test extends  Sugar_PHPUnit_Framework_TestCase
         $this->assertEquals('bar', $_REQUEST['user_password']);
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/modules/Users/authentication/SAMLAuthenticate/Bug49959Test.php b/tests/modules/Users/authentication/SAMLAuthenticate/Bug49959Test.php
new file mode 100755
index 00000000..254f7bc9
--- /dev/null
+++ b/tests/modules/Users/authentication/SAMLAuthenticate/Bug49959Test.php
@@ -0,0 +1,190 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+require_once 'modules/Users/authentication/SAMLAuthenticate/SAMLAuthenticateUser.php';
+require_once 'modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/settings.php';
+require_once 'modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml/response.php';
+
+/**
+ * @ticket 49959
+ */
+class Bug49959Test extends Sugar_PHPUnit_Framework_TestCase
+{
+    /**
+     * @var SAMLAuthenticateUserTest
+     */
+    protected static $auth;
+
+    /**
+     * @var User
+     */
+    protected static $user;
+    protected static $user_id,
+        $user_name  = 'Bug49959TestUser',
+        $user_email = 'bug49959.test.user@example.com';
+
+    /**
+     * This method is called before the first test of this test class is run.
+     *
+     * Creates shared test resources
+     */
+    public static function setUpBeforeClass()
+    {
+        self::$auth = new SAMLAuthenticateUserTest;
+        $user = self::$user = new User();
+
+        $user->user_name = self::$user_name;
+        $user->email1    = self::$user_email;
+
+        self::$user_id = $user->save();
+    }
+
+
+    /**
+     * This method is called after the last test of this test class is run.
+     *
+     * Removes shared test resources
+     */
+    public static function tearDownAfterClass()
+    {
+        self::$user->mark_deleted(self::$user_id);
+    }
+
+    /**
+     * Test fetching of a user to be authenticated by different fields
+     */
+    public function testFetchUser()
+    {
+        // test fetching user by ID
+        $user = self::$auth->fetch_user(self::$user_id, 'id');
+        $this->assertEquals(self::$user_id, $user->id);
+
+        // test fetching user by username
+        $user = self::$auth->fetch_user(self::$user_name, 'user_name');
+        $this->assertEquals(self::$user_id, $user->id);
+
+        // test fetching user by email (default case)
+        $user = self::$auth->fetch_user(self::$user_email);
+        $this->assertEquals(self::$user_id, $user->id);
+
+        // test fetching user by unsupported field
+        $user = self::$auth->fetch_user(self::$user_email, 'unsupported_field');
+        $this->assertNull($user->id);
+
+        // test fetching non-existing user
+        $user = self::$auth->fetch_user('some_wrong_key');
+        $this->assertNull($user->id);
+    }
+
+    /**
+     * Test that get_nameid() method of SamlResponse is called by default
+     */
+    public function testDefaultNameId()
+    {
+        // create a mock of SAML response
+        $mock = $this->getResponse();
+        $mock->expects($this->once())
+            ->method('get_nameid');
+
+        // create a default SAML settings object
+        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
+
+        // expect that get_nameid() method of response is used by default
+        self::$auth->get_user_id($mock, $settings);
+    }
+
+    /**
+     * Test that custom XPath is used when specified in settings
+     */
+    public function testCustomNameId()
+    {
+        $node_id = 'Bug49959Test';
+
+        // create response with custom XML
+        $mock2 = $this->getResponse();
+        $mock2->xml = $this->getResponseXml($node_id);
+
+        // create SAML settings object with custom name id definition
+        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
+        $settings->saml_settings['check']['user_name'] = '//root';
+
+        // expect that user ID is fetched from the document according to settings
+        $result = self::$auth->get_user_id($mock2, $settings);
+        $this->assertEquals($node_id, $result);
+    }
+
+    /**
+     * Returns a mock of SamlResponse object
+     *
+     * @return SamlResponse
+     */
+    protected function getResponse()
+    {
+        return $this->getMock('SamlResponse', array(), array(), '', false);
+    }
+
+    /**
+     * Returns custom response XML document
+     *
+     * @param $node_id
+     * @return DOMDocument
+     */
+    protected function getResponseXml($node_id)
+    {
+        $document = new DOMDocument();
+        $document->loadXML('<root>' . $node_id . '</root>');
+        $root = $document->createElement('root');
+        $document->appendChild($root);
+        return $document;
+    }
+}
+
+/**
+ * A SAMLAuthenticate class wrapper that makes some of its methods accessible
+ */
+class SAMLAuthenticateUserTest extends SAMLAuthenticateUser
+{
+    public function fetch_user($id, $field = null)
+    {
+        return parent::fetch_user($id, $field);
+    }
+
+    public function get_user_id($samlresponse, $settings)
+    {
+        return parent::get_user_id($samlresponse, $settings);
+    }
+}
diff --git a/tests/modules/Users/authentication/SAMLAuthenticate/Bug50936Test.php b/tests/modules/Users/authentication/SAMLAuthenticate/Bug50936Test.php
index e5d6a0c2..51c46b36 100755
--- a/tests/modules/Users/authentication/SAMLAuthenticate/Bug50936Test.php
+++ b/tests/modules/Users/authentication/SAMLAuthenticate/Bug50936Test.php
@@ -69,10 +69,10 @@ class Bug50936Test extends Sugar_PHPUnit_Framework_OutputTestCase
 
 $contents = <<<EOQ
 <?php
-        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
         require('modules/Users/authentication/SAMLAuthenticate/lib/onelogin/saml.php');
+        require(get_custom_file_if_exists('modules/Users/authentication/SAMLAuthenticate/settings.php'));
 
-        \$authrequest = new SamlAuthRequest(get_saml_settings());
+        \$authrequest = new SamlAuthRequest(\$settings);
         \$url = \$authrequest->create();
         echo \$url;
 EOQ;
@@ -81,8 +81,6 @@ EOQ;
 
 $contents = <<<EOQ
 <?php
-            function get_saml_settings()
-            {
                 // this function should be modified to return the SAML settings for the current use
                 \$settings = new SamlSettings();
                 // when using Service Provider Initiated SSO (starting at index.php), this URL asks the IdP to authenticate the user.
@@ -100,9 +98,6 @@ $contents = <<<EOQ
                 // Tells the IdP to return the email address of the current user
                 \$settings->name_identifier_format = "urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress";
 
-                return \$settings;
-            }
-
         ?>
 EOQ;
 
@@ -149,4 +144,4 @@ EOQ;
 
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/service/Bug42683Test.php b/tests/service/Bug42683Test.php
index cd6bad5e..fc7b3ff5 100755
--- a/tests/service/Bug42683Test.php
+++ b/tests/service/Bug42683Test.php
@@ -59,19 +59,32 @@ class Bug42683Test extends SOAPTestCase
         $lead = SugarTestLeadUtilities::createLead();
 
         $this->_login();
-
         $result = $this->_soapClient->call(
             'get_entry_list',
             array(
                 'session' => $this->_sessionId,
                 "module_name" => 'Leads',
                 "query" => "leads.id = '{$lead->id}'",
-                '',
-                0,
-                array(),
-                array(array('name' =>  'email_addresses', 'value' => array('id', 'email_address', 'opt_out', 'primary_address'))),
-                )
-            );
+                'order_by' => '',
+                'offset' => 0,
+                'select_fields' => array(
+                    'name'
+                ),
+                'link_name_to_fields_array' => array(
+                    array(
+                        'name' => 'email_addresses',
+                        'value' => array(
+                            'id',
+                            'email_address',
+                            'opt_out',
+                            'primary_address'
+                        )
+                    )
+                ),
+                'max_results' => 1,
+                'deleted' => 0
+            )
+        );
 
         $this->assertEquals('primary_address', $result['relationship_list'][0][0]['records'][0][3]['name']);
 
diff --git a/tests/service/Bug51723Test.php b/tests/service/Bug51723Test.php
new file mode 100755
index 00000000..ebe3f53b
--- /dev/null
+++ b/tests/service/Bug51723Test.php
@@ -0,0 +1,135 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+require_once('include/nusoap/nusoap.php');
+require_once 'tests/service/SOAPTestCase.php';
+
+/**
+ * Bug 51723
+ *  SOAP::get_entries() call fails to export portal_name field
+ * @ticket 51723
+ * @author arymarchik@sugarcrm.com
+ */
+class Bug51723Test extends SOAPTestCase
+{
+    private $_contact;
+    private $_opt = null;
+
+    public function setUp()
+    {
+        $this->markTestIncomplete("Test breaking on CI, working with dev to fix");
+        $administration = new Administration();
+        $administration->retrieveSettings();
+        if(isset($administration->settings['portal_on']))
+        {
+            $this->_opt = $administration->settings['portal_on'];
+        }
+        $administration->saveSetting('portal', 'on',  1);
+
+        $this->_soapURL = $GLOBALS['sugar_config']['site_url'].'/soap.php?wsdl';
+        parent::setUp();
+        $this->_login();
+        $GLOBALS['app_strings'] = return_application_language($GLOBALS['current_language']);
+        $GLOBALS['app_list_strings'] = return_app_list_strings_language($GLOBALS['current_language']);
+
+        $this->_contact = new Contact();
+        $this->_contact->last_name = "Contact #bug51723";
+        $this->_contact->id = create_guid();
+        $this->_contact->new_with_id = true;
+        $this->_contact->team_id = 1;
+        $this->_contact->save();
+    }
+
+    public function tearDown()
+    {
+        //$this->_contact->mark_deleted($this->_contact->id);
+        parent::tearDown();
+
+        $administration = new Administration();
+        $administration->retrieveSettings();
+        if($this->_opt === null)
+        {
+            if(isset($administration->settings['portal_on']))
+            {
+                $administration->saveSetting('portal', 'on', 0);
+            }
+        }
+        else
+        {
+            $administration->saveSetting('portal', 'on',  $this->_opt);
+        }
+    }
+
+    /**
+     * Testing SOAP method get_entries for existing "portal_name" field
+     * @group 51723
+     */
+    public function testPortalNameInGetEntries()
+    {
+        $fields = array('portal_name', 'first_name', 'last_name');
+        $result = $this->_soapClient->call(
+            'get_entries',
+            array('session' => $this->_sessionId,
+                'module_name' => 'Contacts',
+                'ids' => array($this->_contact->id),
+                'select_fields' => $fields
+            )
+        );
+        // replacement of $this->assertCount()
+        if(count($result['entry_list']) != 1)
+        {
+            $this->fail('Can\'t get entry list');
+        }
+
+        foreach ($result['entry_list'][0]['name_value_list'] as $key => &$value)
+        {
+            if(($index = array_search($value['name'], $fields, true)) !== false)
+            {
+                unset($fields[$index]);
+            }
+            else
+            {
+                $this->fail('Wrong field in selected fields:' . $value['name']);
+            }
+        }
+        if(count($fields) != 0)
+        {
+            $this->fail('Can\'t get expected values:' . implode(',', $fields));
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/tests/soap/Bug41392Test.php b/tests/soap/Bug41392Test.php
index 5be8689f..d8b58fbf 100755
--- a/tests/soap/Bug41392Test.php
+++ b/tests/soap/Bug41392Test.php
@@ -48,7 +48,7 @@ class Bug41392Test extends SOAPTestCase
 {
     public function setUp()
     {
-        $this->_soapURL = $GLOBALS['sugar_config']['site_url'].'/soap.php?XDEBUG_SESSION_START=michael';
+        $this->_soapURL = $GLOBALS['sugar_config']['site_url'].'/soap.php';
         parent::setUp();
     }
 
diff --git a/tests/soap/Bug43339Test.php b/tests/soap/Bug43339Test.php
new file mode 100755
index 00000000..47357f96
--- /dev/null
+++ b/tests/soap/Bug43339Test.php
@@ -0,0 +1,165 @@
+<?php
+/*********************************************************************************
+ * SugarCRM Community Edition is a customer relationship management program developed by
+ * SugarCRM, Inc. Copyright (C) 2004-2012 SugarCRM Inc.
+ * 
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License version 3 as published by the
+ * Free Software Foundation with the addition of the following permission added
+ * to Section 15 as permitted in Section 7(a): FOR ANY PART OF THE COVERED WORK
+ * IN WHICH THE COPYRIGHT IS OWNED BY SUGARCRM, SUGARCRM DISCLAIMS THE WARRANTY
+ * OF NON INFRINGEMENT OF THIRD PARTY RIGHTS.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License along with
+ * this program; if not, see http://www.gnu.org/licenses or write to the Free
+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA.
+ * 
+ * You can contact SugarCRM, Inc. headquarters at 10050 North Wolfe Road,
+ * SW2-130, Cupertino, CA 95014, USA. or at email address contact@sugarcrm.com.
+ * 
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU Affero General Public License version 3.
+ * 
+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * SugarCRM" logo. If the display of the logo is not reasonably feasible for
+ * technical reasons, the Appropriate Legal Notices must display the words
+ * "Powered by SugarCRM".
+ ********************************************************************************/
+
+
+require_once("service/v4_1/SugarWebServiceImplv4_1.php");
+require_once('tests/service/SOAPTestCase.php');
+require_once('soap/SoapError.php');
+
+/**
+ * Bug #43339
+ * get_entries_count doesn't work with custom fields
+ *
+ * @ticket 43339
+ */
+class Bug43339Test extends SOAPTestCase
+{
+
+    private $_module = NULL;
+    private $_moduleName = 'Contacts';
+    private $_customFieldName = 'test_custom_c';
+    private $_field = null;
+    private $_df = null;
+
+    protected $session = array();
+
+    public function setUp()
+    {
+        $this->session['use_cookies'] = ini_get('session.use_cookies');
+        $this->session['cache_limiter'] = ini_get('session.session.cache_limiter');
+        ini_set('session.use_cookies', false);
+        ini_set('session.cache_limiter', false);
+
+        SugarTestHelper::setUp('beanList');
+        SugarTestHelper::setUp('beanFiles');
+
+        $_SERVER['REMOTE_ADDR'] = '0.0.0.0';
+
+        $this->_setupTestUser();
+
+        $this->_field = get_widget('varchar');
+        $this->_field->id = $this->_moduleName . $this->_customFieldName;
+        $this->_field->name = $this->_customFieldName;
+        $this->_field->vanme = 'LBL_' . strtoupper($this->_customFieldName);
+        $this->_field->comments = NULL;
+        $this->_field->help = NULL;
+        $this->_field->custom_module = $this->_moduleName;
+        $this->_field->type = 'varchar';
+        $this->_field->label = 'LBL_' . strtoupper($this->_customFieldName);
+        $this->_field->len = 255;
+        $this->_field->required = 0;
+        $this->_field->default_value = '';
+        $this->_field->date_modified = '2012-03-14 02:23:23';
+        $this->_field->deleted = 0;
+        $this->_field->audited = 0;
+        $this->_field->massupdate = 0;
+        $this->_field->duplicate_merge = 0;
+        $this->_field->reportable = 1;
+        $this->_field->importable = 'true';
+        $this->_field->ext1 = NULL;
+        $this->_field->ext2 = NULL;
+        $this->_field->ext3 = NULL;
+        $this->_field->ext4 = NULL;
+
+        $className = $beanList[$this->_moduleName];
+        require_once($beanFiles[$className]);
+        $this->_module = new $className();
+
+        $this->_df = new DynamicField($this->_moduleName);
+
+        $this->_df->setup($this->_module);
+        $this->_df->addFieldObject($this->_field);
+    }
+
+    /**
+     * get_entries_count doesn't work with custom fields
+     *
+     * @group 43339
+     */
+    public function testGetEntriesCountForCustomField()
+    {
+        $api = new SugarWebServiceImplv4_1();
+        $auth = $api->login(array('user_name' => self::$_user->user_name, 'password' => self::$_user->user_hash, 'version' => '.01'), 'SoapTest', array());
+        $assert = $api->get_entries_count($auth['id'], $this->_moduleName, $this->_customFieldName . ' LIKE \'\'', 0);
+        $api->logout($auth['id']);
+
+        $this->assertNotEquals(NULL, $assert['result_count']);
+    }
+
+    /**
+     * Test for soap/SoapSugarUsers.php::get_entries_count()
+     *
+     * @group 43339
+     */
+    public function testGetEntriesCountFromBasicSoap()
+    {
+        $this->_soapURL = $GLOBALS['sugar_config']['site_url'].'/soap.php';
+        parent::setUp();
+
+        $auth = $this->_soapClient->call('login',
+            array('user_auth' =>
+            array(
+                'user_name' => $this->_user->user_name,
+                'password' => $this->_user->user_hash,
+                'version' => '.01'),
+                'application_name' => 'SoapTest', "name_value_list" => array()
+            )
+        );
+
+        $params = array(
+            'session' => $auth['id'],
+            'module_name' => $this->_moduleName,
+            'query' => $this->_customFieldName . ' LIKE \'\'',
+            'deleted' => 0
+        );
+        $assert = $this->_soapClient->call('get_entries_count', $params);
+
+        $this->assertNotEquals(NULL, $assert['result_count']);
+    }
+
+    public function tearDown()
+    {
+        $this->_df->deleteField($this->_field);
+
+        SugarTestHelper::tearDown();
+        unset($_SERVER['REMOTE_ADDR']);
+
+        $this->_tearDownTestUser();
+
+        ini_set('session.use_cookies', $this->session['use_cookies']);
+        ini_set('session.cache_limiter', $this->session['cache_limiter']);
+    }
+}
diff --git a/themes/Sugar5/css/style.css b/themes/Sugar5/css/style.css
index 6006ff5f..37f81aaf 100644
--- a/themes/Sugar5/css/style.css
+++ b/themes/Sugar5/css/style.css
@@ -3670,7 +3670,7 @@ td.teamset-row, .edit tr td.teamset-row, .edit tr td table tr td.teamset-row {
 
 ul.clickMenu {
 	list-style: none;
-	padding: 0px 3px 0px 0px;	
+	padding: 0px 0px 0px 0px;
 	margin: 0 !important;
 	vertical-align: bottom;
     background-color: #ECF1F4;
@@ -3686,18 +3686,22 @@ ul.clickMenu form{
 ul.SugarActionMenuIESub {
 }
 
-ul.clickMenu:hover {
+#globalLinksModule ul.clickMenu.SugarActionMenu li a:hover,
+#globalLinksModule ul.clickMenu li:hover span,
+ul.SugarActionMenuIESub li a:hover, ul.clickMenu.SugarActionMenu li a:hover, ul.clickMenu.SugarActionMenu li span.subhover:hover,
+ul#globalLinksSubnav li a:hover, ul#quickCreateULSubnav li a:hover,
+ul.clickMenu li ul.subnav li a:hover,ul.clickMenu li ul.subnav li input:hover, ul.clickMenu.subpanel.records li ul.subnav li a:hover, ul.clickMenu ul.subnav-sub li a:hover { /*--Hover effect for subnav links--*/
+
    		background-color: #4e8ccf;
-   		background-image: none;
-		border-color: #4e8ccf;
+   		border-color: #4e8ccf;
 		color: #fff;	
 }
 ul#globalLinksSubnav.SugarActionMenuIESub li a:hover, ul#quickCreateULSubnav.SugarActionMenuIESub li a:hover,
 ul.clickMenu:hover > li > span > a, ul.clickMenu:hover > li > a {
-	color: #fff !important;	
+	/*color: #fff !important;*/
 }
 
-ul.clickMenu:hover > li > span {
+ul.clickMenu li span.ab:hover {
 	background-position: 6px 0px;
 }
 ul.clickMenu li, ul.SugarActionMenuIESub li {
@@ -3730,7 +3734,7 @@ ul.clickMenu li.single a{
 ul.clickMenu li a:hover{
 text-decoration: none !important;
 }
-ul.clickMenu li > span { /*--Drop down trigger styles--*/
+ul.clickMenu li span.ab { /*--Drop down trigger styles--*/
 	width: 17px;
 	height: 16px;
 	float: left;
@@ -3738,7 +3742,7 @@ ul.clickMenu li > span { /*--Drop down trigger styles--*/
 	cursor: pointer;
 }
 
-ul.clickMenu li > span.ab { /*--Drop down trigger styles--*/
+ul.clickMenu li span.ab { /*--Drop down trigger styles--*/
     border-left: 1px #aaa solid;
     padding-left: 5px;
 }
@@ -3778,25 +3782,27 @@ ul.clickMenu.subpanel.records {
 	background-image: none;
 }
 
+/*
 ul.clickMenu.subpanel.records:hover {
 	background-color: #4e8ccf !important;
 	background-image: none !important;
 	border-color: #4e8ccf !important;
 }
+*/
 
 ul.clickMenu.subpanel.records li a{ 
 	color: #aaa;	
 }
-ul.clickMenu.subpanel.records:hover > li div a{ 
-	color: #fff !important;	
+ul.clickMenu.subpanel.records > li div:hover a{
+	color: #fff !important;
 }
 
 ul.clickMenu.subpanel.records li > span{ 
 	opacity: .5;
     height: 16px;
-    padding: 0 !important;
-    width: 15px;
-    background-position: right -28px;
+    width: 17px;
+    padding:0 5px 0 0 !important;
+    background-position: 50% -28px;
 }
 
 ul.clickMenu.subpanel.records:hover li > span{ 
@@ -3808,23 +3814,26 @@ ul.clickMenu.subpanel.records li ul.subnav li a span {
 	width: 0px;
 	background-image: none;
 }
+ul.clickMenu.button li span.ab:hover {
+    background-position: 50% 0px;
 
+}
 ul.clickMenu.button li > span {
 	width: auto;
-	background-position: right -20px;	
+	background-position: 50% -20px;
 	padding: 3px 15px 3px 10px !important;
 	height: auto;
 }
 
 ul.clickMenu.button:hover li > span {
-	background-position: right 0px;
+
 }
 
 ul.clickMenu.button li > span a {
 	padding: 0px !important;
 }
 
-ul.clickMenu.button {
+ul.clickMenu.button span {
 	padding-right: 5px;
 }
 
@@ -3882,7 +3891,7 @@ ul.clickMenu li ul.subnav li input {
 }
 ul.SugarActionMenuIESub li a:hover,
 ul.clickMenu li ul.subnav li a:hover,ul.clickMenu li ul.subnav li input:hover, ul.clickMenu.subpanel.records li ul.subnav li a:hover, ul.clickMenu ul.subnav-sub li a:hover { /*--Hover effect for subnav links--*/
-background-color: #355b7e;
+background-color: #4e8ccf;
 color: #fff;
 font-weight: normal !important;
 font-size: 12px !important;
-- 
2.42.0