Update gradle.properties
Merge branch 'master' of https://github.com/Netflix/ribbon

Conflicts:
	gradle.properties