Fix the probation end date issue. And add the niwant logo on header.
change the date format.
conflict rexovled