Merge branch 'master' into develop
added new incoming message handler for feeds
Merge pull request #23 from burrows-codefest/feature-incoming_feed_handler

added new incoming message handler for feeds
Sneaky sneaky
Merge branch 'develop'