Merge branch 'master' into drone-service

Conflicts:
	catroid/src/at/tugraz/ist/catroid/ui/dragndrop/DragAndDropListView.java