More stuff

Signed-off-by: craigmoliver <craigmoliver@gmail.com>
Add Annotation workish

Signed-off-by: craigmoliver <craigmoliver@gmail.com>
Merge from fork
Merge branch 'master' into hugh
TEST

TEST
test2

test2
Merge branch 'hugh'

Conflicts:
	WorkTicket/src/db/AnnotationDTO.java