update to spring loaded 1.1.2
Merge branch '2.2.x'

Conflicts:
	build.gradle