Package Rule
Merge branch 'master' of https://github.com/Schunk/fdd-projet
Fix conflicts