Renommages
Merge branch 'master' of github.com:pierre-gentile/test-cxx

Conflicts:
	src/model/data/PfiData.cpp