Update comments/spacing, and remove duplicate
Merge branch 'master' into develop

Conflicts:
	src/main/resources/messages-fr.yml
Update comments