Merge pull request #3 from greese/develop

Develop
Fixed admin password parsing bug.
Merge pull request #15 from erik-johnson/develop

Password bugfix