SOAP Web Services 14 - Using JAXB annotations
Merge branch 'master' of https://github.com/koushikkothagal/Testmart

Conflicts:
	src/org/koushik/javabrains/ProductCatalog.java