fixed mergeMerge branch 'master' into STREAMS-68,218

Conflicts:
	streams-contrib/streams-provider-facebook/src/main/java/org/apache/streams/facebook/api/FacebookPostActivityConverter.java