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

Conflicts:
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBCategoryCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBCategoryModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBEntityResourceCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBIngredientsInfoCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBIngredientsInfoModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBNutritionInfoCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBNutritionInfoModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBObjectRelationCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBObjectRelationModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBProductCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBProductModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBProductSizeCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBProductSizeModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBStockKeepingUnitCacheModel.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/model/impl/SBStockKeepingUnitModelImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBEntityResourceLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBIngredientsInfoLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBNutritionInfoLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBObjectRelationLocalServiceBaseImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBObjectRelationLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBProductLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBProductSizeLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/base/SBStockKeepingUnitLocalServiceClpInvoker.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/impl/SBProductLocalServiceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/persistence/SBIngredientsInfoPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/persistence/SBNutritionInfoPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/persistence/SBObjectRelationPersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/starbucks/service/persistence/SBProductSizePersistenceImpl.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/service.properties
	portlets/demo-service-builder-portlet/docroot/WEB-INF/lib/demo-service-builder-portlet-service.jar