Added local-settings.php
Updated local-settings.php
Merge branch 'master' into develop