small bugfixes
Minor bugfixes
Merge branch 'master' of https://github.com/liisj/CHP.git

Conflicts:
	PortletTest-portlet/docroot/WEB-INF/classes/com/test/NewPortlet2.class