added timestamp to users
complete the merge
added devise