JSR310 additions

Conflicts:
	gradle.properties