Updated gradle build configuration for gradle 2.0, and including gradle wrapper now
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gradle/wrapper/gradle-wrapper.jar
	gradle/wrapper/gradle-wrapper.properties