Add support for any ContextFactory
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/graphwalker/cli/CLI.java