Fixed DuplicateEmailException (previously added to wrong controller)
Merge remote-tracking branch 'origin/master'
rest
Merge remote-tracking branch 'origin/master'