commit for merge with master
commit for merge
Merge branch 'VirtualGamepad' of https://github.com/Catrobat/Catroid into VirtualGamepad

Conflicts:
	build.gradle