Merge branch 'master' of https://github.com/genesis-groupe/cra-v2

Conflicts:
	package.json
Merge branch 'master' of https://github.com/genesis-groupe/cra-v2