Completed merge edits for settings and urls

changed database username, deleted hellotest