added mergeaccounts code to editAction too, similiar to userUpdate
fixed validation messages
Merge pull request #115 from geekhub-php/user-validation-bug

Fix bug in userEdit