server commit. Status links now sort by date descending.
conflict fix