Conflicts:
	.gitignore
	pom.xml
	src/main/java/com/servioticy/dispatcher/DispatcherContext.java
	src/main/java/com/servioticy/dispatcher/DispatcherTopology.java
	src/main/java/com/servioticy/dispatcher/bolts/StreamDispatcherBolt.java
	src/main/java/com/servioticy/dispatcher/bolts/StreamProcessorBolt.java
	src/main/java/com/servioticy/dispatcher/bolts/SubscriptionRetrieveBolt.java
	src/test/java/com/servioticy/servicedispatcher/TopologyTest.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/servioticy/dispatcher/DispatcherContext.java
	src/main/java/com/servioticy/dispatcher/DispatcherTopology.java
	src/main/java/com/servioticy/dispatcher/bolts/StreamProcessorBolt.java