added my gradle file
Merge origin/master