new attribute syntax
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/main/java/xdi2/core/features/nodetypes/XdiAbstractClass.java