Moved icon.png
Merge https://github.com/liisj/CHP

Conflicts:
	PortletTest-portlet/docroot/html/newportlet2/init.jsp