Changed home path
Merge branch 'cocoa' into develop