On-the-job training, categories
On-the-job training, categories
Merge branch 'master' of https://github.com/liisj/CHP

Conflicts:
	PortletTest-portlet/docroot/WEB-INF/src/com/test/NewPortlet2.java