Merge branch 'master' into development_marc
fixes #193
fixes #194
small refactoring
Merge pull request #196 from Catrobat/development_marc

reachability moved; dowload/play button