Merge branch 'master' of C:\wamp\www\ImmoTEP with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
correction bordel