gradle.build changes
Merge branch 'android-dsl' of https://github.com/Arasthel/SwissKnife

Conflicts:
	build.gradle
	dsl-samples/build.gradle