removed .gradle from vcs
Merge branch 'develop'
merge