OJT: categories
DMA: new order, joining backend/frontend
Merge branch 'master' of https://github.com/liisj/CHP.git

Conflicts:
	PortletTest-portlet/docroot/WEB-INF/classes/com/test/DataBaseFunctions.class
DMA: connecting backend and frontend
Merge branch 'master' of https://github.com/liisj/CHP.git

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