Merge pull request #1 from OWASP/master

Update
Added "@" and "." to userID acceptable chars
Forgot to add "-" to userID acceptable chars
Merge pull request #76 from paulocmguerreiro/master

Added "@" and "." to userID acceptable chars