*) Updated soap server
*) Merged soap and rest server
Revert "*) Merged soap and rest server"

This reverts commit 5c1f49f69eaebd3269aed049b5b259a1c327446b.
*) Updated merged project
Revert "*) Merged soap and rest server"

This reverts commit 5c1f49f69eaebd3269aed049b5b259a1c327446b.
*) Updated soap service
*) Added merged soap rest service