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

Conflicts:
	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