fix for tokenGraph
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/xdi2/connector/facebook/contributor/FacebookContributor.java