again...
trying...
Merge branch 'master' of github.com:michalgut/Dart

Conflicts:
	.gitignore
	GlobalResource/Billpay/billpay.properties
	GlobalResource/Billpay/billpay.xml
	GlobalResource/CSR/CSR_regression.xml
	GlobalResource/CSR/CSS.properties
	GlobalResource/Enrollment/CSS.properties
	GlobalResource/Enrollment/Enrollment.properties
	GlobalResource/Enrollment/spark/SparkEnrollCustomer.xls
	GlobalResource/Enrollment/streamenergy/streamenergy_csr.xls
	GlobalResource/Enrollment/streamenergy/streamenergy_ws.xls
	GlobalResource/Enrollment/streamenergy/streamenergy_ws.xml
	GlobalResource/Functional/CSS.properties
	GlobalResource/Functional/streamenergy/streamenergy_csr.xls
	GlobalResource/Functional/streamenergy/streamenergy_csr.xml
	GlobalResource/Functional/streamenergy/streamenergy_wp.xls
	GlobalResource/IEDriverServer_32.exe
	GlobalResource/IEDriverServer_x64.exe
	GlobalResource/ProductDevelopment/CSS.properties
	GlobalResource/ProductDevelopment/CustomerTimeLine/customertimeline.xml
	GlobalResource/ProductDevelopment/productdevelopment.properties
	GlobalResource/Transactions/CSS.properties
	GlobalResource/Transactions/Transactions.properties
	src/com/ista/b2b2/tests/AccountReceivable.java
	src/com/ista/b2b2/tests/B2b2.java
	src/com/ista/b2b2/tests/B2b2Utility.java
	src/com/ista/b2b2/tests/ManageAccounts.java
	src/com/ista/b2b2/tests/Reports.java
	src/com/ista/b2b2/tests/ServiceLocations.java
	src/com/ista/billpay/tests/AnnotationTransformer.java
	src/com/ista/billpay/tests/Billpay.java
	src/com/ista/billpay/tests/BillpayUtility.java
	src/com/ista/billpay/tests/EnergyPlus.java
	src/com/ista/billpay/tests/GreenMountain.java
	src/com/ista/billpay/tests/Liberty.java
	src/com/ista/billpay/tests/RegEnergyPlus.java
	src/com/ista/billpay/tests/RegGreenMountain.java
	src/com/ista/billpay/tests/RegLibertyPower.java
	src/com/ista/billpay/tests/RegStarTex.java
	src/com/ista/billpay/tests/RegTexpo.java
	src/com/ista/billpay/tests/TexPo.java
	src/com/ista/budgetbilling/tests/BudgetBillingDBQueries.java
	src/com/ista/budgetbilling/tests/BudgetBillingUtility.java
	src/com/ista/budgetbilling/tests/BudgetBillingWithoutEnroll.java
	src/com/ista/cash/tests/AnnotationTransformer.java
	src/com/ista/cash/tests/AutoPay.java
	src/com/ista/cash/tests/EnergyPlusPayments.java
	src/com/ista/cash/tests/HudsonEnergyNewCreditCard.java
	src/com/ista/cash/tests/JustEnergyNewCreditCard.java
	src/com/ista/cash/tests/Login.java
	src/com/ista/cash/tests/PostCashValidation.java
	src/com/ista/cash/tests/SelectCustomer.java
	src/com/ista/cash/tests/TexpoNewCreditCard.java
	src/com/ista/csr/activitymenu/tests/Adjustments.java
	src/com/ista/csr/activitymenu/tests/CustomerAddressMaintenance.java
	src/com/ista/csr/activitymenu/tests/SpecialCharges.java
	src/com/ista/csr/activitymenu/tests/TaxesBycustomer.java
	src/com/ista/csr/activitymenu/tests/ViewChangeLog.java
	src/com/ista/csr/activitymenu/tests/ViewMarketData.java
	src/com/ista/csr/activitymenu/tests/ViewRates.java
	src/com/ista/csr/administration/tests/BatchPrintAdministrationNew.java
	src/com/ista/csr/administration/tests/BulkAdjustmentUpload.java
	src/com/ista/csr/administration/tests/BulkCallNoteUpdate.java
	src/com/ista/csr/administration/tests/BulkInvoiceAdminClient.java
	src/com/ista/csr/administration/tests/ClientAlertAministration.java
	src/com/ista/csr/administration/tests/ClientEventConfig.java
	src/com/ista/csr/administration/tests/ClientRateAdministration.java
	src/com/ista/csr/administration/tests/CustomerBillingFileAdmin.java
	src/com/ista/csr/administration/tests/GroupSetup.java
	src/com/ista/csr/administration/tests/InvoiceMessageAdmin.java
	src/com/ista/csr/administration/tests/LetterPrintAdmin.java
	src/com/ista/csr/administration/tests/PostPayment.java
	src/com/ista/csr/administration/tests/PremiseSetup.java
	src/com/ista/csr/administration/tests/ScheduledReports.java
	src/com/ista/csr/administration/tests/TDSP820Payments.java
	src/com/ista/csr/administration/tests/TdspMatrixAdmin.java
	src/com/ista/csr/administration/tests/TemplateAdministration.java
	src/com/ista/csr/administration/tests/UserSetup.java
	src/com/ista/csr/common/tests/Login.java
	src/com/ista/csr/tests/ARBilling.java
	src/com/ista/csr/tests/CSR.java
	src/com/ista/csr/tests/CommonTask.java
	src/com/ista/csr/tests/CommunicationLog.java
	src/com/ista/csr/tests/CsrUtility.java
	src/com/ista/csr/tests/CustomerInfo.java
	src/com/ista/csr/tests/DailyBillingReport.java
	src/com/ista/csr/tests/Help.java
	src/com/ista/csr/tests/IgniteInfo.java
	src/com/ista/csr/tests/Logout.java
	src/com/ista/csr/tests/UtilityAccounts.java
	src/com/ista/csr/tests/WorkspaceMenu.java
	src/com/ista/enrollment/tests/AccentFileEnrollment.java
	src/com/ista/enrollment/tests/AccentWSRequestResponseParser.java
	src/com/ista/enrollment/tests/AccentWsEnrollment.java
	src/com/ista/enrollment/tests/EnergyPlusFileEnrollment.java
	src/com/ista/enrollment/tests/Enrollment.java
	src/com/ista/enrollment/tests/EnrollmentUtility.java
	src/com/ista/enrollment/tests/GreenMountainCsrEnrollment.java
	src/com/ista/enrollment/tests/HudsonWSRequestResponceParser.java
	src/com/ista/enrollment/tests/HudsonWSResidentialRequestResponceParser.java
	src/com/ista/enrollment/tests/HudsonWsEnrollment.java
	src/com/ista/enrollment/tests/HudsonWsEnrollmentResidential.java
	src/com/ista/enrollment/tests/JustEnergyCsrEnrollment.java
	src/com/ista/enrollment/tests/JustEnergybatchenrollment.java
	src/com/ista/enrollment/tests/LibertyWSRequestResponseParser.java
	src/com/ista/enrollment/tests/SSECsrEnrollment.java
	src/com/ista/enrollment/tests/SparkWSRequestResponceParser.java
	src/com/ista/enrollment/tests/SparkWsEnrollment.java
	src/com/ista/enrollment/tests/StreamCsrEnrollment.java
	src/com/ista/enrollment/tests/StreamWebportalEnrollment.java
	src/com/ista/enrollment/tests/TRECsrEnrollment.java
	src/com/ista/enrollment/tests/TexpoWSRequestResponseParser.java
	src/com/ista/enrollment/tests/TexpoWsNonTexasEnrollment.java
	src/com/ista/enrollment/tests/TexpoWsTexasEnrollment.java
	src/com/ista/enrollmentDBValidation/tests/AnnotationTransformer.java
	src/com/ista/enrollmentDBValidation/tests/DBValidate.java
	src/com/ista/enrollmentDBValidation/tests/EnrollmentDBValidation.java
	src/com/ista/framework/Backup.java
	src/com/ista/framework/DataBase.java
	src/com/ista/framework/Logs.java
	src/com/ista/framework/Mail.java
	src/com/ista/framework/Reports.java
	src/com/ista/framework/Setup.java
	src/com/ista/framework/Utility.java
	src/com/ista/framework/XlsEngine.java
	src/com/ista/functional/Functional.java
	src/com/ista/functional/FunctionalUtility.java
	src/com/ista/functional/streamenergy/tests/CsrPricingGrid.java
	src/com/ista/functional/streamenergy/tests/WPCustomerNumberFormat.java
	src/com/ista/functional/streamenergy/tests/WPEnrollmentCustInfoPage.java
	src/com/ista/functional/streamenergy/tests/WPNECommercial.java
	src/com/ista/functional/streamenergy/tests/WPProductListing.java
	src/com/ista/functional/streamenergy/tests/WPZipCodes.java
	src/com/ista/functional/streamenergy/tests/WebPortalUtility.java
	src/com/ista/invoicing/tests/BatchInvoice.java
	src/com/ista/invoicing/tests/Invoice.java
	src/com/ista/invoicing/tests/InvoicingDataBase.java
	src/com/ista/invoicing/tests/InvoicingUtility.java
	src/com/ista/invoicing/tests/SingleInvoice.java
	src/com/ista/other/lizard/Lizard.java
	src/com/ista/productdevelopment/customertimeline/tests/CustomerTimeLineUtility.java
	src/com/ista/transactions/files/tests/Prism_810.java
	src/com/ista/transactions/files/tests/Prism_814_C.java
	src/com/ista/transactions/files/tests/Prism_814_D.java
	src/com/ista/transactions/files/tests/Prism_814_E.java
	src/com/ista/transactions/files/tests/Prism_814_R.java
	src/com/ista/transactions/files/tests/Prism_820.java
	src/com/ista/transactions/files/tests/Prism_867.java
	src/com/ista/transactions/files/tests/TPID.java
	src/com/ista/transactions/files/tests/TX_650_02.java
	src/com/ista/transactions/files/tests/TX_810.java
	src/com/ista/transactions/files/tests/TX_814_05.java
	src/com/ista/transactions/files/tests/TX_814_25.java
	src/com/ista/transactions/files/tests/TX_867.java
	src/com/ista/transactions/files/tests/TransactionFile.java
	src/com/ista/transactions/tests/CSRTransaction.java
	src/com/ista/transactions/tests/ChangeRequest.java
	src/com/ista/transactions/tests/Customer.java
	src/com/ista/transactions/tests/DataSet.java
	src/com/ista/transactions/tests/GlobalServiceWatcher.java
	src/com/ista/transactions/tests/InboundTransactionDrop.java
	src/com/ista/transactions/tests/InboundTransactionValidation.java
	src/com/ista/transactions/tests/Meter.java
	src/com/ista/transactions/tests/OutboundTransactionValidation.java
	src/com/ista/transactions/tests/RowCopy.java
	src/com/ista/transactions/tests/TransactionBody.java
	src/com/ista/transactions/tests/TransactionDBStatus.java
	src/com/ista/transactions/tests/TransactionUtility.java
	src/com/ista/transactions/tests/Transactions.java
	src/com/ista/transactions/tests/TransactionsInvoicing.java
	src/com/ista/transactions/tests/TransactionsStartup.java
	src/com/ista/transactions/tests/TransactionsXlsEngine.java