Version 1.0.2
Merge branch 'Android_1.0.2'

Conflicts:
	.project
	AndroidManifest.xml
	readme.txt