Merge pull request #1 from rash805115/master

UPdate
Added "@." to userID whitelist chars
Forgot to add "-" to userID acceptable chars
Merge pull request #14 from shivamdixit/master

Fixed regex for email validation
email done
corrected zip
added comments in javascripts
modified controllers to show error when session expires
completed updateuser
updated index page
Merge pull request #15 from paulocmguerreiro/master

Added "@" and "." to userID acceptable chars
updated userID validation
regex done for all fields