Updating QA4 test data
Merge branch 'origin' of
https://github.com/jenkinsforsam/SamProjects2014 into origin

Conflicts:
	data/TestSetup.yml