Tidying ..
Tidying
resolve merge conflicts
Merge branch 'jean-master'