Changed the package name for enabling livewallpaper to be installed at
the same time with the normal catroid app
Minor changes for the apk installation
Merge branch 'CatWall_Master' into CatWall_MajdaOsmic
Debugging the apk building
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	catroid/src/org/catrobat/catroid/ui/dialogs/StageDialog.java
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	catroid/src/org/catrobat/catroid/content/bricks/GlideToBrick.java
	catroid/src/org/catrobat/catroid/livewallpaper/LiveWallpaper.java
	catroid/src/org/catrobat/catroid/livewallpaper/WallpaperCostume.java
	catroid/src/org/catrobat/catroid/ui/dialogs/CopyProjectDialog.java
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	catroid/src/org/catrobat/catroid/ui/ProjectActivity.java
	catroidUiTest/src/org/catrobat/catroid/uitest/ui/ScriptTabActivityTest.java
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	.gitignore
	catroid/src/org/catrobat/catroid/content/bricks/ChangeBrightnessByNBrick.java
	catroid/src/org/catrobat/catroid/content/bricks/ChangeGhostEffectByNBrick.java
	catroid/src/org/catrobat/catroid/content/bricks/SetBrightnessBrick.java
	catroid/src/org/catrobat/catroid/content/bricks/SetGhostEffectBrick.java
	catroid/src/org/catrobat/catroid/livewallpaper/WallpaperCostume.java
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	catroid/src/org/catrobat/catroid/content/bricks/MoveNStepsBrick.java
	catroid/src/org/catrobat/catroid/content/bricks/PointInDirectionBrick.java
	catroid/src/org/catrobat/catroid/ui/fragment/SpritesListFragment.java
Merge remote-tracking branch 'origin/CatWall_Master' into CatWall_ApkBuilding
Merge branch 'CatWall_Master' into CatWall_ApkBuilding
Conflict resolve
Merge branch 'CatWall_Master' into CatWall_ApkBuilding
Merge branch 'CatWall_Master' into CatWall_ApkBuilding

Conflicts:
	catroid/src/org/catrobat/catroid/content/bricks/IfOnEdgeBounceBrick.java
	catroid/src/org/catrobat/catroid/content/bricks/MoveNStepsBrick.java
	catroid/src/org/catrobat/catroid/livewallpaper/LiveWallpaper.java
	catroid/src/org/catrobat/catroid/livewallpaper/WallpaperCostume.java