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

Conflicts:
	portlets/demo-webcontent-custom-portlet/docroot/custom_jsps/html/portlet/journal/edit_structure_xsd_el.jsp