adapted some stuff, essentially for ASC2 use
Merge branch 'master' of https://github.com/GradleFx/GradleFx

Conflicts:
	build.gradle