resolved StageListener Conflict
deleted useless file
conflict fixed
resolved onResume problem
Merge branch 'LiveWallpaper_Master' of https://github.com/Catrobat/Catroid into LiveWallpaper_Master
deleted some useless files