updated API and node types
Merge branch 'master' of
https://github.com/projectdanube/xdi2-example-core.git

Conflicts:
	src/main/java/xdi2/example/core/ContextNodeTypesSample.java
	src/main/java/xdi2/example/core/SimpleCoreSample.java