commit
Merge branch 'master' of https://github.com/azufr/plugins

Conflicts:
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/META-INF/portlet-hbm.xml
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/META-INF/portlet-model-hints.xml
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/META-INF/portlet-orm.xml
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/META-INF/portlet-spring.xml
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/CategoryCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/CategoryModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/IngredientsInfoBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/IngredientsInfoCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/IngredientsInfoModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/NutritionInfoBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/NutritionInfoCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/NutritionInfoModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductSizeBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductSizeCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductSizeModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/RelatedProductsCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/RelatedProductsModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/SKUCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/SKUModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/CategoryLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/CategoryLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/IngredientsInfoLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/IngredientsInfoLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/NutritionInfoLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/NutritionInfoLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/ProductLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/ProductLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/ProductSizeLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/ProductSizeLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/RelatedProductsLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/RelatedProductsLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/SKULocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/base/SKULocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/impl/RelatedProductsLocalServiceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$AddProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$ClearProducts.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$ContainsProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl$RemoveProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/CategoryPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/IngredientsInfoPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/IngredientsInfoPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/IngredientsInfoPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/NutritionInfoPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/NutritionInfoPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/NutritionInfoPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$AddCategory.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$AddSKU.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$ClearCategories.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$ClearSKUs.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$ContainsCategory.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$ContainsSKU.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$RemoveCategory.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl$RemoveSKU.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductSizePersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductSizePersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/ProductSizePersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/RelatedProductsPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/RelatedProductsPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/RelatedProductsPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$1.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$2.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$AddProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$AddProductSize.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$ClearProductSizes.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$ClearProducts.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$ContainsProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$ContainsProductSize.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$RemoveProduct.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl$RemoveProductSize.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/service/persistence/SKUPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/service.properties
	themes/demo-theme/docroot/templates/portal_normal.vm