on a mission to remove "xri", "segment", "subsegment" terms
more removal of "xri" term
more terminology cleanup
fixing data types
more getting rid of "segment" and "subsegment"
more removal of "xri" term
WIP reorganizing link contracts, and support for variable
singletons/collections
Merge remote-tracking branch 'origin/no-xri'

Conflicts:
	core/src/main/java/xdi2/core/constants/XDILinkContractConstants.java
	core/src/main/java/xdi2/core/features/linkcontracts/GenericLinkContract.java
	core/src/main/java/xdi2/core/features/linkcontracts/GovernorLinkContract.java
	core/src/main/java/xdi2/core/features/linkcontracts/LinkContractBase.java
	core/src/main/java/xdi2/core/features/linkcontracts/LinkContractTemplate.java
	core/src/main/java/xdi2/core/features/linkcontracts/LinkContracts.java
	core/src/main/java/xdi2/core/features/linkcontracts/PublicLinkContract.java
	core/src/main/java/xdi2/core/features/linkcontracts/RootLinkContract.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/Condition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/EqualsCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/GenericCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/GreaterCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/IsCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/LesserCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/condition/MatchesCondition.java
	core/src/main/java/xdi2/core/features/linkcontracts/evaluation/GraphPolicyEvaluationContext.java
	core/src/main/java/xdi2/core/features/linkcontracts/evaluation/PolicyEvaluationContext.java
	core/src/main/java/xdi2/core/features/linkcontracts/operator/ConditionOperator.java
	core/src/main/java/xdi2/core/features/linkcontracts/operator/FalseOperator.java
	core/src/main/java/xdi2/core/features/linkcontracts/operator/TrueOperator.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/Policy.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyAnd.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyNot.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyOr.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyRoot.java
	core/src/main/java/xdi2/core/features/linkcontracts/policy/PolicyUtil.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractCollection.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractMemberOrdered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractMemberUnordered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeMemberOrdered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeMemberUnordered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntityMemberOrdered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntityMemberUnordered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiVariable.java
	core/src/test/java/xdi2/tests/core/features/linkcontracts/LinkContractsTest.java
	messaging/src/main/java/xdi2/messaging/target/contributor/ContributorMount.java
	messaging/src/main/java/xdi2/messaging/target/contributor/impl/digest/GenerateDigestSecretTokenContributor.java
	messaging/src/main/java/xdi2/messaging/target/contributor/impl/keygen/GenerateKeyContributor.java
	messaging/src/main/java/xdi2/messaging/target/impl/ContributorExecutor.java
	messaging/src/main/java/xdi2/messaging/target/interceptor/impl/BootstrapInterceptor.java
	messaging/src/main/java/xdi2/messaging/target/interceptor/impl/linkcontract/LinkContractInterceptor.java
	messaging/src/main/java/xdi2/messaging/target/interceptor/impl/util/MessagePolicyEvaluationContext.java
requester link contract WIP