Merge "DAOException.java -This block of commented-out lines of code should be removed"