Conform untranslated comments
Merge branch 'master' into develop

Conflicts:
	src/main/resources/messages-pt.yml