fix bugs
refactoring of streams manager
Merge branch 'master' of
https://github.com/socialsensor/socialsensor-stream-manager.git

Conflicts:
	src/main/java/eu/socialsensor/sfc/streams/monitors/StreamsMonitor.java