some testing of service discovery
updated
wip
Fixed a bunch of encoding issues on the confluence doc files
Fixed a bunch of encoding issues on the confluence doc files
Merge branch 'master' into curator-rpc

Conflicts:
	curator-x-discovery-server/src/site/confluence/index.confluence
	curator-x-discovery/src/site/confluence/index.confluence
	src/site/confluence/getting-started.confluence
	src/site/confluence/index.confluence
work on packaging and doc
work on packaging and doc
doc wip