Moved command line parsing to args4j, removing the need for a custom jar file
Merge pull request #5 from sfuhrm/args4j2

Moved command line parsing to args4j, removing xp-forge/jcli
Merge branch 'master' of https://github.com/kiesel/johanna

Conflicts:
	src/main/java/org/oneandone/idev/johanna/JohannahServer.java