Add Portlet to ear
Merge branch 'master' of https://github.com/exo-addons/staging-extension

Conflicts:
	ear/pom.xml