modified develop-settings.php
Merge branch 'develop' of github.com:tigeraven/testsite into develop
Merge branch 'develop'