ongoing work on new XDI syntax
Merge branch 'master' into develop

Conflicts:
	core/src/main/java/xdi2/core/io/readers/XDIJSONReader.java
work in progress to support context functions
work in progress for context functions
work in progress
Merge branch 'master' into develop
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP
WIP