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

Conflicts:
	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
	portlets/demo-service-builder-portlet/docroot/WEB-INF/src/service.properties
update
update
daily
daily