Added log for cleaning
Merge branch 'shifts'
Merge branch 'clientside'
Merge branch 'master' into clientside