Fixes issue #27
Refactor a bit
Hotfix password validation
Merge branch 'master' into build
Grunt build