Hopefully this is our finnal commit.
Merge branch 'iteration3' of https://github.com/NameCT/CIS.git into
iteration3

Conflicts:
	ATs/AddSoap.act
	ATs/CreateClientWithExtra.act