User Controller updated (mapping)
Merge remote-tracking branch 'origin/master'