Merge branch 'master' into PhysicsPainsi

Conflicts:
	catroidTest/src/org/catrobat/catroid/test/utiltests/UtilFileTest.java