Develop Setting : ADD gradle folder
Merge branch 'master' into Calender