AAAHHH
Merge pull request #123 from jkuk/master

AHHHHH
Merge pull request #124 from WannabeSid/master

Email Panel is back
Password hashing
Merge pull request #125 from daverboy23/master

password hashing
password hashing
Merge pull request #126 from daverboy23/master

password hashing
commit for chardizard