Fixed the translation issue.
Fixed the system properties model to work on linux.
Fixed the failing friend test on linux.
Added the private key directory update.
Fixed the friend model test to work on windows and unix.
Merge branch 'master' into matt
Fixing broken tests.
Fixing broken tests.
Fixed broken tests.
Removed unused test.