update gradle plugin
Merge branch 'origin/master'

Conflicts:
	HorizontalVariableListView/build.gradle