nic
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	GlobalResource/GlobalConfig.properties
	GlobalResource/Transactions/Transactions.properties
	GlobalResource/Transactions/Transactions.xml
	GlobalResource/Transactions/scenario.list
sync
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	GlobalResource/GlobalConfig.properties
	GlobalResource/Transactions/Transactions.properties
	GlobalResource/Transactions/scenario.list
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	GlobalResource/Transactions/Datasheets/default/814,820_expanded.xls
Merge branch 'master' of github.com:michalgut/DartWIP
.
..
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	GlobalResource/GlobalConfig.properties
	src/com/ista/framework/Framework.java
Merge branch 'master' of github.com:michalgut/DartWIP

Conflicts:
	GlobalResource/Invoicing/Invoicing.xml
	src/com/ista/transactions/tests/InboundTransactionValidation.java
	src/com/ista/transactions/tests/TransactionUtility.java