prepare 1.2
Merge branch '1.1'

Conflicts:
	build.gradle
improve build.gradle
upgrade to gradle 1.12