Ajustements JShint
Merge