Minor changes to User model
added ticket log
resolved merge conflicts