Fixed an issue that was causing some strings to appear as untranslated.
Merge branch 'master' into devel

Conflicts:
	pom.xml