Version number update for next release.
Switched to HTTP repository.
Merge branch '2.0_bugfix'

Conflicts:
	AndroidManifest.xml
	pom.xml
Fixed pom merge problem