Merge remote-tracking branch 'origin/master'

Conflicts:
	FullScreenImageTest/src/main/res/values-de/strings.xml