Upped version to 2.0.M1...
Merge branch '2.0'

Conflicts:
	gradle.properties