fixed #323: [resolve]: Look for self-caps before going out to the
repositories
fixed #324: diff: adding a method to a consumertype increments verison
incorrectly
fixed #322: uses directive elements not consistent order
Merge remote-tracking branch 'origin/master' into next

Conflicts:
	biz.aQute.resolve/src/biz/aQute/resolve/internal/BndrunResolveContext.java