Upgrade to ES 1.2

Conflicts:
	gradle.properties
Revert failing test