Undid erroneous optimization in SubScriptActor in previous commit
Merge branch 'develop' of https://github.com/AndreVanDelft/scala into develop