updated gradle version
Merge branch 'master' of https://github.com/andresesfm/android-support-v4-preferencefragment

Conflicts:
	build.gradle