)
Merge branch 'master' of github.com:colitman/ConfluenceConsoleGUI

Conflicts:
	project/lib/confluence-cli-2.6.0/confluence.bat