Merge branch 'alvaro'

Conflicts:
	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/StreamProcessorBolt.java
	src/main/java/com/servioticy/dispatcher/bolts/SubscriptionRetrieveBolt.java
	src/test/java/com/servioticy/servicedispatcher/TopologyTest.java