fixed
changed if to else if
removed unnec. code
adapted test
Merge pull request #448 from Catrobat/fixBroadcastMessages

Fix broadcast messages