commit message eclipse3
Adding line
Merge remote-tracking branch 'origin/test' into test

Conflicts:
	src/au/com/woolworths/mcr/test/TestSuite.java