use java 1.6 for the server
Merge branch 'master' of https://github.com/biosemantics/oto.git
Merge branch 'master' of https://github.com/biosemantics/oto.git

Conflicts:
	oto-lite/src/main/java/edu/arizona/biosemantics/oto/lite/db/GlossaryIDConverter.java