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

Conflicts:
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/model/impl/ProductImpl.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/portlet/ProductAdminPortlet.class
	portlets/demo-service-builder-portlet/docroot/WEB-INF/classes/com/mlc/liferay/portlet/ProductAdminUtil.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/impl/ProductLocalServiceImpl.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/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/rebel.xml