Bumped the version.
Merge branch '1.8'

Conflicts:
	src/main/AndroidManifest.xml