Merge matthew's work from the "drjava-hj-code-completion" branch til rev 5688
Authored by: vincent_cave 2012-08-19
Parent: [r5688]
Child: [r5690]