update to Gradle 2.1
update gradle-docker-plugin
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.gradle