Develop settings

merge develop settings with develop branch