Merge remote-tracking branch 'origin/MatzeBranch'

Conflicts:
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	appcompat_v7/bin/appcompat_v7.jar