DAO.java:Removed commented out code
Merge branch 'Spring' of https://github.com/subwoofer359/aplsystem into Spring

Conflicts:
	src/main/java/org/amc/dao/DAO.java
MouldingProcessUtil.java: Fixed Logger referencing the wrong class, fixed constants
MouldingProcessForm.java:chnaged accessors to instance variables to private
MaterialActionFactory.java:Commented code
MyFunction.java:Commented code