added comment
commit
comment
commit
Merge branch 'master' of https://github.com/biosemantics/oto.git

Conflicts:
	oto-client/pom.xml
	oto-client/src/main/java/edu/arizona/biosemantics/oto/client/oto2/Client.java