Added constructor with arguments and changed hashcode and equals.
Created one method from two using saveOrUpdate from DAO.
Added null to something.
Merge remote-tracking branch 'origin/develop' into develop