Gradle wrapper update

Author: evgeny-goldin-akqa

gradle/wrapper/gradle-wrapper.properties

@@ -1,14 +1,6 @@
-<<<<<<< HEAD
-#Sun Aug 11 15:27:22 CEST 2013
-=======
-#Sun May 19 14:55:02 CEST 2013
->>>>>>> jfrog/master
+#Tue Aug 27 11:34:39 CEST 2013
 distributionBase=GRADLE_USER_HOME
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-rc-1-bin.zip
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-<<<<<<< HEAD
 distributionUrl=http\://services.gradle.org/distributions/gradle-1.7-bin.zip
-=======
-zipStoreBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
->>>>>>> jfrog/master