Fixed logic and design bugs in New Order and Incoming Package, commented
DMA code
dirty worktree stuff
Merge branch 'master' of https://github.com/liisj/CHP.git

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