Merge remote-tracking branch 'origin/int_tr65_nra_2.3.1' into dev_tr65_nra_ft872_inva...

Conflicts:
	dev/common/libhrgonio/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_sup/SupBlade/CHANGELOG.txt
	dev/modele/implementation/trc6500_chaine_sup/SupProdData/CHANGELOG.txt

diff --cc .gitignore
index 5b16382834d10bfe74365446cde3f127f082cb6a,5b16382834d10bfe74365446cde3f127f082cb6a..b1fa04f3b35a2afbb367829fd6fef611e6dc2a3e
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,12 -2,12 +2,17 @@@
  config.log
  prod
  prod_rhp*
++
++#####################################################################
++# Temp/IDE generated files
++#####################################################################
  *~
  *.contrib*
  *.keep
  *.pyc
  *.o
  *.os
++*.orig
  .*project
  .settings