Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	src/reltool.config.in
Merge branch 'develop' of github.com:dieswaytoofast/CloudI into develop

Conflicts:
	src/reltool.config.in
patch version
add methods for query_by_doc