alchemy
Merge branch 'feature-belser' into team3

Conflicts:
	p2-storm/src/main/java/be/bigdata/workshops/p2/storm/Topology.java
	p2-storm/src/main/java/be/bigdata/workshops/p2/storm/TwitterSpout.java