updated BaseModel.created_by and modified_by to point to user
Merge remote-tracking branch 'origin/master'