removing default.settings.php from untracked files
Merge branch 'develop'
robots.txt. team
adding default files
remove disallow robots
Merge branch 'release-1.0' into develop