resolve conflicts from Need.java
Merge branch 'MathiDeLuxe-master'