password change and username at least 2 chars
merge fixes, password and username length

Merge branch 'master' of https://github.com/katarinakyh/cc7