update
added cancels
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	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/ViewChangeLog.java
	src/com/ista/csr/activitymenu/tests/ViewMarketData.java
	src/com/ista/csr/administration/tests/BulkAdjustmentUpload.java
	src/com/ista/csr/administration/tests/GroupSetup.java
	src/com/ista/csr/tests/CommunicationLog.java
	src/com/ista/functional/FunctionalUtility.java
	src/com/ista/functional/streamenergy/tests/WebPortalUtility.java
	src/com/ista/invoicing/tests/InvoicingUtility.java