TEST

TEST
Merge branch 'hugh'

Conflicts:
	WorkTicket/src/db/AnnotationDTO.java
Lib files
eSummary

Description
Jason Latest
Jason still lost
Ticket Helper test upload
UserHelperTest and TicketHelperTest
Merge branch 'george' into jason
Merge branch 'jason' into hugh

Conflicts:
	WorkTicket/.classpath
	WorkTicket/src/db/AnnotationDTO.java
	WorkTicket/src/db/WorkTicketDAO.java