fixed concurrent modification exception
version => 1.8.1
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml
updated ChangeLog
Merge branch 'master' into android-1.5