made some changes to the names of fields in the user and profile tables
Merge remote-tracking branch 'origin/master'