edited gradle file
Merge origin/master
edited gradle file