Merge remote-tracking branch 'origin/master'

Conflicts:
	Projet_Crytp/src/project_crypto/Controllers/CryptoController.java
Merge remote-tracking branch 'origin/master'