shopizer-developers

diff --git a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
index 767e850..9473de1 100644
--- a/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
+++ b/shopizer-canadapost/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-canadapost-module/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:41 EDT 2016
+#Thu Oct 27 12:29:25 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-canadapost

diff --git a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
index 89f4256..e7342de 100644
--- a/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
+++ b/shopizer-shipping-distance-module/target/classes/META-INF/maven/com.shopizer/shopizer-shipping-distance-processor/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:41 EDT 2016
+#Thu Oct 27 12:29:23 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=shopizer-shipping-distance-processor

diff --git a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
index 3c3ebd1..d94678f 100644
--- a/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
+++ b/sm-core/target/classes/META-INF/maven/com.shopizer/sm-core/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:48 EDT 2016
+#Thu Oct 27 12:29:17 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core

diff --git a/sm-core-model/target/classes/.gitignore b/sm-core-model/target/classes/.gitignore
index c2d9872..0fb5df8 100644
--- a/sm-core-model/target/classes/.gitignore
+++ b/sm-core-model/target/classes/.gitignore
@@ -1 +1,2 @@
 /com/
+/META-INF/

diff --git a/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties b/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
index 8f37e5b..d4cea0b 100644
--- a/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
+++ b/sm-core-model/target/classes/META-INF/maven/com.shopizer/sm-core-model/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:49 EDT 2016
+#Thu Oct 27 12:29:22 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core-model

diff --git a/sm-core-modules/target/classes/.gitignore b/sm-core-modules/target/classes/.gitignore
index c2d9872..0fb5df8 100644
--- a/sm-core-modules/target/classes/.gitignore
+++ b/sm-core-modules/target/classes/.gitignore
@@ -1 +1,2 @@
 /com/
+/META-INF/

diff --git a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
index dc3dcfd..a707950 100644
--- a/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
+++ b/sm-core-modules/target/classes/META-INF/maven/com.shopizer/sm-core-modules/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:49 EDT 2016
+#Thu Oct 27 12:29:22 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-core-modules

diff --git a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
index 31ad4bd..800f392 100644
--- a/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
+++ b/sm-search/target/classes/META-INF/maven/com.shopizer/sm-search/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:49 EDT 2016
+#Thu Oct 27 12:29:25 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-search

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Address.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Address.java
index 8d16bb7..37c5599 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Address.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/Address.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/AnonymousCustomer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/AnonymousCustomer.java
index e26aef9..6a10402 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/AnonymousCustomer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/AnonymousCustomer.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 public class AnonymousCustomer extends PersistableCustomer {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOption.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOption.java
index ca147d0..a4eee82 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOption.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOption.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class CustomerOption extends Entity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.java
index af8b614..875d27c 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.catalog.CatalogEntity;
+import com.salesmanager.shop.model.catalog.CatalogEntity;
+
 
 public class CustomerOptionDescription extends CatalogEntity implements
 		Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.java
index ca8fa1b..692869f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.java
index 44e5e2d..52b187a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class CustomerOptionValue extends Entity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.java
index 1098ed3..56b36fb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.catalog.CatalogEntity;
+import com.salesmanager.shop.model.catalog.CatalogEntity;
 
 public class CustomerOptionValueDescription extends CatalogEntity implements
 		Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.java
index 73bebfe..a55ab7f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.java
index c740d6a..a2a8c4f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 public class PersistableCustomerAttribute extends CustomerAttributeEntity {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.java
index 7db2c79..311d6b8 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.java
index 7e046e9..60a2f65 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.java
index 165b57c..71c2e8d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.java
index cdf0885..bbcbcec 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer.attribute;
+package com.salesmanager.shop.model.customer.attribute;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerPassword.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerPassword.java
index 753df66..4b12b6d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerPassword.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/CustomerPassword.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 
@@ -6,7 +6,7 @@ import javax.validation.constraints.Size;
 
 import org.hibernate.validator.constraints.NotEmpty;
 
-import com.salesmanager.web.utils.FieldMatch;
+import com.salesmanager.shop.utils.FieldMatch;
 
 @FieldMatch.List({
     @FieldMatch(first="password",second="checkPassword",message="password.notequal")

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/DeliveryEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/DeliveryEntity.java
index d291283..fe66c63 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/DeliveryEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/DeliveryEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/PersistableCustomer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/PersistableCustomer.java
index 6dc4511..656e826 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/PersistableCustomer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/PersistableCustomer.java
@@ -1,9 +1,11 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.web.entity.customer.attribute.PersistableCustomerAttribute;
+import com.salesmanager.shop.model.customer.attribute.PersistableCustomerAttribute;
+
+
 
 public class PersistableCustomer extends CustomerEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableDelivery.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableDelivery.java
index 02fe16d..c233516 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableDelivery.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/ReadableDelivery.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 public class ReadableDelivery extends DeliveryEntity {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredCustomer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredCustomer.java
index 061537b..6d22056 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredCustomer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredCustomer.java
@@ -1,10 +1,10 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 import java.io.Serializable;
 
 import javax.validation.constraints.Size;
 
-import com.salesmanager.web.utils.FieldMatch;
+import com.salesmanager.shop.utils.FieldMatch;
 
 
 @FieldMatch.List({

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.java b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.java
index a1d3ff9..9c83b5a 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.customer;
+package com.salesmanager.shop.model.customer;
 
 
 public class SecuredShopPersistableCustomer extends SecuredCustomer {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/CartModificationException.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/CartModificationException.java
index d714389..9b7e090 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/CartModificationException.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/CartModificationException.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 /**
  * @author Umesh A

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/Order.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/Order.java
index de170b3..840f916 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/Order.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/Order.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
 
 public class Order extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderEntity.java
index f7ac720..86060ed 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderEntity.java
@@ -1,12 +1,12 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import com.salesmanager.core.business.order.model.orderstatus.OrderStatus;
-import com.salesmanager.core.business.order.model.payment.CreditCard;
-import com.salesmanager.core.business.payments.model.PaymentType;
+import com.salesmanager.core.model.order.orderstatus.OrderStatus;
+import com.salesmanager.core.model.order.payment.CreditCard;
+import com.salesmanager.core.model.payments.PaymentType;
 
 public class OrderEntity extends Order implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProduct.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProduct.java
index 1a77abe..32d5406 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProduct.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProduct.java
@@ -1,8 +1,9 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class OrderProduct extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProductEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProductEntity.java
index 2bd7fd7..d5afcdb 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProductEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderProductEntity.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.catalog.product.ReadableProduct;
+import com.salesmanager.shop.model.catalog.product.ReadableProduct;
 
 public class OrderProductEntity extends OrderProduct implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
index 0a0ec6a..5d27127 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/OrderTotal.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
+
 
 public class OrderTotal extends Entity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrder.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrder.java
index 7bcc26e..36601f7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrder.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrder.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.web.entity.customer.PersistableCustomer;
+import com.salesmanager.shop.model.customer.PersistableCustomer;
+
 
 public class PersistableOrder extends OrderEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrderProduct.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrderProduct.java
index af015fc..d693aa1 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrderProduct.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/PersistableOrderProduct.java
@@ -1,10 +1,11 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
-import com.salesmanager.web.entity.catalog.product.attribute.ProductAttribute;
+import com.salesmanager.shop.model.catalog.product.attribute.ProductAttribute;
+
 
 public class PersistableOrderProduct extends OrderProductEntity implements
 		Serializable {

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
index 6eba97e..7dfa300 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrder.java
@@ -1,12 +1,12 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.core.business.reference.currency.model.Currency;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.ReadableCustomer;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
+import com.salesmanager.core.model.reference.currency.Currency;
+import com.salesmanager.shop.model.customer.ReadableCustomer;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
+
 
 public class ReadableOrder extends OrderEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderList.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderList.java
index b11034e..cb262ae 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderList.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderList.java
@@ -1,9 +1,10 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;
 
-import com.salesmanager.web.entity.ServiceEntity;
+import com.salesmanager.shop.model.ServiceEntity;
+
 
 public class ReadableOrderList extends ServiceEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProduct.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProduct.java
index 3175eac..f75895e 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProduct.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProduct.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.java
index b61f488..67befa7 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
 
 public class ReadableOrderProductAttribute extends Entity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductDownload.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductDownload.java
index 64da1ab..2d7e788 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductDownload.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderProductDownload.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.Entity;
+import com.salesmanager.shop.model.Entity;
 
 public class ReadableOrderProductDownload extends Entity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderTotal.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderTotal.java
index 75839c3..acc2b67 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderTotal.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableOrderTotal.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
index 09c5a78..5b7fe52 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShippingSummary.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -6,9 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.salesmanager.core.business.shipping.model.ShippingOption;
-import com.salesmanager.web.entity.customer.Address;
-import com.salesmanager.web.entity.customer.ReadableDelivery;
+import com.salesmanager.core.model.shipping.ShippingOption;
+import com.salesmanager.shop.model.customer.ReadableDelivery;
 
 public class ReadableShippingSummary implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShopOrder.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShopOrder.java
index 3cb13c6..421b733 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShopOrder.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ReadableShopOrder.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ShopOrder.java b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ShopOrder.java
index e80bd1c..ed157ac 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/order/ShopOrder.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/order/ShopOrder.java
@@ -1,13 +1,14 @@
-package com.salesmanager.web.entity.order;
+package com.salesmanager.shop.model.order;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
-import com.salesmanager.core.business.order.model.OrderTotalSummary;
-import com.salesmanager.core.business.shipping.model.ShippingOption;
-import com.salesmanager.core.business.shipping.model.ShippingSummary;
-import com.salesmanager.core.business.shoppingcart.model.ShoppingCartItem;
+import com.salesmanager.core.model.order.OrderTotalSummary;
+import com.salesmanager.core.model.shipping.ShippingOption;
+import com.salesmanager.core.model.shipping.ShippingSummary;
+import com.salesmanager.core.model.shoppingcart.ShoppingCartItem;
+
 
 /**
  * Orders saved on the website

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/Breadcrumb.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/Breadcrumb.java
index 4fd9f5f..c6de0cf 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/Breadcrumb.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/Breadcrumb.java
@@ -1,10 +1,11 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.salesmanager.core.business.reference.language.model.Language;
+import com.salesmanager.core.model.reference.language.Language;
+
 
 public class Breadcrumb implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItem.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItem.java
index a2b57a2..fa44ff5 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItem.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItem.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItemType.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItemType.java
index 217244d..4e8630d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItemType.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/BreadcrumbItemType.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 public enum BreadcrumbItemType {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ContactForm.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ContactForm.java
index e8e21b7..3139a2f 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ContactForm.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ContactForm.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import org.hibernate.validator.constraints.Email;
 import org.hibernate.validator.constraints.NotEmpty;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/MerchantStoreEntity.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/MerchantStoreEntity.java
index 64447d9..93f7f25 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/MerchantStoreEntity.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/MerchantStoreEntity.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/PageInformation.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/PageInformation.java
index 5cc0524..0bb88ac 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/PageInformation.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/PageInformation.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import java.io.Serializable;
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ReadableMerchantStore.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ReadableMerchantStore.java
index 4dd59fa..0c8bee0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ReadableMerchantStore.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shop/ReadableMerchantStore.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shop;
+package com.salesmanager.shop.model.shop;
 
 import java.io.Serializable;
 import java.util.List;

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.java
index c4b249b..cc3dfd2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.java
@@ -1,8 +1,8 @@
-package com.salesmanager.web.entity.shoppingcart;
+package com.salesmanager.shop.model.shoppingcart;
 
 import java.io.Serializable;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
 
 public class ShoppingCartAttribute extends ShopEntity implements Serializable {
 

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.java
index 6b7023e..5efddb2 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.java
@@ -1,4 +1,4 @@
-package com.salesmanager.web.entity.shoppingcart;
+package com.salesmanager.shop.model.shoppingcart;
 
 import java.io.Serializable;
 import java.util.List;
@@ -6,8 +6,9 @@ import java.util.List;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import com.salesmanager.web.entity.ShopEntity;
-import com.salesmanager.web.entity.order.OrderTotal;
+import com.salesmanager.shop.model.ShopEntity;
+import com.salesmanager.shop.model.order.OrderTotal;
+
 
 @Component
 @Scope(value = "prototype")

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.java b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.java
index 1c99f5c..8454c4d 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.java
@@ -1,10 +1,11 @@
-package com.salesmanager.web.entity.shoppingcart;
+package com.salesmanager.shop.model.shoppingcart;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
 
-import com.salesmanager.web.entity.ShopEntity;
+import com.salesmanager.shop.model.ShopEntity;
+
 
 public class ShoppingCartItem extends ShopEntity implements Serializable {
 	

diff --git a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatch.java b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatch.java
index 681d1c3..424d1f0 100644
--- a/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatch.java
+++ b/sm-shop/src/main/java/com/salesmanager/shop/utils/FieldMatch.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package com.salesmanager.web.utils;
+package com.salesmanager.shop.utils;
 
 import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
 import static java.lang.annotation.ElementType.TYPE;

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/Address.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/Address.class
index 4c862be..e1ab493 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/Address.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/Address.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/AnonymousCustomer.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/AnonymousCustomer.class
index a620a94..0c6b8f7 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/AnonymousCustomer.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/AnonymousCustomer.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOption.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOption.class
index d5cc42c..b59531a 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOption.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOption.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class
index 5b6187b..5b5dce7 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionDescription.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class
index 22a7359..f220a30 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class
index e796870..0a537e1 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValue.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class
index 6788d06..a107daa 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueDescription.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class
index bbc78cd..5cc9727 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/CustomerOptionValueEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class
index 110131a..116ebc8 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerAttribute.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class
index d630ecf..4ed5bae 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOption.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class
index 7db607c..a5231a4 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/PersistableCustomerOptionValue.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class
index 01ad83c..01a4ee2 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOption.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class
index bc6b5d6..99385fb 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/attribute/ReadableCustomerOptionValue.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerPassword.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerPassword.class
index 5a2ae9d..49e79d1 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerPassword.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/CustomerPassword.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/DeliveryEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/DeliveryEntity.class
index e36492a..7e6b35b 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/DeliveryEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/DeliveryEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/PersistableCustomer.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/PersistableCustomer.class
index 7ea1127..90045c7 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/PersistableCustomer.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/PersistableCustomer.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableDelivery.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableDelivery.class
index 835ec74..0cd643b 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableDelivery.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/ReadableDelivery.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredCustomer.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredCustomer.class
index a51fdf7..9f95171 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredCustomer.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredCustomer.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class b/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class
index 1377295..7b04093 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class and b/sm-shop/target/classes/com/salesmanager/shop/model/customer/SecuredShopPersistableCustomer.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/CartModificationException.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/CartModificationException.class
index e95616b..010c7ba 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/CartModificationException.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/CartModificationException.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/Order.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/Order.class
index 70b6d02..3f86953 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/Order.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/Order.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderEntity.class
index eecae48..d11fd37 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProduct.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProduct.class
index 6fdaad4..6b942a3 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProduct.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProduct.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProductEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProductEntity.class
index 887abf7..2fd94c3 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProductEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderProductEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderTotal.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderTotal.class
index 9f6b2b3..430f0dc 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderTotal.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/OrderTotal.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrder.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrder.class
index 989b7ea..04e5b1a 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrder.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrder.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrderProduct.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrderProduct.class
index b7f90f0..50d37b2 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrderProduct.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/PersistableOrderProduct.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrder.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrder.class
index de13ef9..1f0c342 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrder.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrder.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderList.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderList.class
index 7903fd3..54b8d4e 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderList.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderList.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProduct.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProduct.class
index 7356d82..6b61e41 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProduct.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProduct.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class
index 44befa5..1812e60 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductAttribute.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class
index d7bcead..dd17c9c 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderProductDownload.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderTotal.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderTotal.class
index 5c281ce..a06eaf2 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderTotal.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableOrderTotal.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShippingSummary.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShippingSummary.class
index f872a37..c3a0e1a 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShippingSummary.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShippingSummary.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShopOrder.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShopOrder.class
index 202df99..8d16a80 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShopOrder.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ReadableShopOrder.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/order/ShopOrder.class b/sm-shop/target/classes/com/salesmanager/shop/model/order/ShopOrder.class
index 35cdc8f..5ff2a77 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/order/ShopOrder.class and b/sm-shop/target/classes/com/salesmanager/shop/model/order/ShopOrder.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/Breadcrumb.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/Breadcrumb.class
index 17c002a..9e525ed 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/Breadcrumb.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/Breadcrumb.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItem.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItem.class
index 35064ef..7783053 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItem.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItem.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItemType.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItemType.class
index 265c808..c5bb8b4 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItemType.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/BreadcrumbItemType.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/ContactForm.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/ContactForm.class
index ea84996..4d2fa97 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/ContactForm.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/ContactForm.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/MerchantStoreEntity.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/MerchantStoreEntity.class
index ac92f65..4ff5fad 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/MerchantStoreEntity.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/MerchantStoreEntity.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/PageInformation.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/PageInformation.class
index 6a2eb34..a769ab1 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/PageInformation.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/PageInformation.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shop/ReadableMerchantStore.class b/sm-shop/target/classes/com/salesmanager/shop/model/shop/ReadableMerchantStore.class
index 8b25705..1374e1b 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shop/ReadableMerchantStore.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shop/ReadableMerchantStore.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class
index 36cd2bc..ea403aa 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartAttribute.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.class b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.class
index 15c81b7..254b812 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartData.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.class b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.class
index 4e6b498..d3b2685 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.class and b/sm-shop/target/classes/com/salesmanager/shop/model/shoppingcart/ShoppingCartItem.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch$List.class b/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch$List.class
index 8262aca..692b10e 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch$List.class and b/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch$List.class differ

diff --git a/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch.class b/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch.class
index aaad5af..9c9fa2a 100644
Binary files a/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch.class and b/sm-shop/target/classes/com/salesmanager/shop/utils/FieldMatch.class differ

diff --git a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
index a8039e9..54e0458 100644
--- a/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
+++ b/sm-shop/target/m2e-wtp/web-resources/META-INF/maven/com.shopizer/sm-shop/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven Integration for Eclipse
-#Wed Oct 26 12:41:52 EDT 2016
+#Thu Oct 27 12:29:29 EDT 2016
 version=2.5.0-SNAPSHOT
 groupId=com.shopizer
 m2e.projectName=sm-shop