small change
Merge branch 'master' of https://github.com/bwalker99/Sandbox

Conflicts:
	TestWSClient/src/ca/ubc/med/ws/demo/service/ObjectFactory.java