Change minimum length of password to 6
Modify regexp for email
Add test for user model
Merge branch 'develop'