timestamp in user model
delete log & tmp files
logout action
merge