dev property file.
Merge branch 'develop' into va/non-social-friends
Dev properties.
Merge branch 'develop' into va/non-social-friends