Small UI fixes
Fix compilation when samba file is not others readable

This happens when any smb.conf or included file is not others readable,
thus we are fallbacking to the default installation path.
Merge pull request #54 from Zentyal/ejhernandez/fix-comp-non-root

Fix compilation when samba file is not others readable
Merge branch 'master' into mjulian/ui-fixes
NSString:objectFromJSONString now can parse single values

Like null => [NSNull null]
Merge pull request #53 from Zentyal/mjulian/ui-fixes

Small UI fixes
Merge pull request #55 from Zentyal/jgarcia/fix-null-contacts-cached

Fix contacts cached that don't belong to our domain
Merge branch 'master' into trusty