Removed settings.php
Merge branch 'develop'