remove the jar from the cif2pnml branch
Merge branch 'master' into cif2pnml

Conflicts:
	archive/fmt.jar
Merge branch 'master' into cif2pnml
Merge branch 'master' into cif2pnml
Merge branch 'master' into cif2pnml
Merge branch 'master' into cif2pnml
Merge branch 'master' into cif2pnml