Fix fr locale
Fixing fragment witching behaviour
Merge branch 'master' into rest

Conflicts:
	res/values-fr/strings.xml