Activities
conflicts fixed
added own eventbus implementation
Merge remote-tracking branch 'origin/Dennis'