added new entities - merchant & consumer

Change-Id: Ibec33e61b4ef44a45aef29ec1869d41b1f1d18dd