add groups

Conflicts:
	src/main/resources/messages/messages_en.properties
	src/main/resources/messages/messages_fr.properties