class -> collection
Merge branch 'master' of https://github.com/projectdanube/xdi2.git

Conflicts:
	core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeInstanceOrdered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiAttributeInstanceUnordered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntityClass.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntityInstanceOrdered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntityInstanceUnordered.java
	core/src/main/java/xdi2/core/features/nodetypes/XdiEntitySingleton.java
class -> collection