fixed xml serialization
Merge branch 'master' into android-1.5
new beta version (2.0 beta 8)
Merge branch 'master' into android-1.5