Merge branch 'master' of https://github.com/MANHIGA/Gang-Authority

Conflicts:
src/model/TypeSbire.java
TypeSbire modifié
TypeSbire modifié2