some cleaning
Merge branch 'LiveWallpaper_libgdx_update' into LiveWallpaper_Master

Conflicts:
	.gitignore
	catroid/AndroidManifest.xml
	catroid/lint.xml
	catroid/src/org/catrobat/catroid/stage/StageActivity.java
	catroid/src/org/catrobat/catroid/stage/StageListener.java
Merge branch 'LiveWallpaper_Master' of https://github.com/Catrobat/Catroid into LiveWallpaper_Master

Conflicts:
	.gitignore
	catroid/AndroidManifest.xml
	catroid/lint.xml
	catroid/src/org/catrobat/catroid/stage/StageActivity.java
	catroid/src/org/catrobat/catroid/stage/StageListener.java