Fixed scrypt dependencies
Add test users
Let other people accept people
special string for diff types
Merging bufixes
Merge branch 'bugFixes'