Additions to integration tests
Merge branch 'master' of https://github.com/j-dasilva/cms

Conflicts:
	RunIntegrationTests.bat