Merge pull request #4 from apache/master

Merge Apache
Merge pull request #5 from apache/master

Merge From Apache
STREAMS-105 | Ensured that the user_mentions entries are correctly structured and that the activity object has the correct ID and content
STREAMS-105 | Code review feedback
STREAMS-105 | Code review feedback
Merge pull request #6 from apache/master

Merge Apache
STREAMS-105 | Code review feedback
STREAMS-105 | Code review feedback
Merge pull request #7 from apache/master

Merge Apache
Merge pull request #8 from apache/master

Merge Apache
Merge branch 'master' into STREAMS-105

Conflicts:
	streams-contrib/streams-provider-datasift/src/main/java/org/apache/streams/datasift/serializer/DatasiftTweetActivitySerializer.java
Merge PR47 branch 'rdouglas/STREAMS-105'