Merge pull request #4 from apache/master

Merge Apache
Merge pull request #5 from apache/master

Merge From Apache
Merge pull request #6 from apache/master

Merge Apache
Merge branch 'instagram' into STREAMS-122
STREAMS-122 | Updated the InstagramActivityUtil class to fully map Instagram MediaFeedData objects to Activities. Updated tests so that this deserialization and mapping can be tested
STREAMS-105 | Updated the InstagramTypeConverter to use the conversion utility functions provided in InstagramActivityUtil
Merge branch 'instagram' into STREAMS-122
STREAMS-122 | Added header
STREAMS-122 | Responded to code review feedback
STREAMS-121 | Merged apache instagram branch