fixed xml serialization
Merge branch 'master' into ice-cream-sandwich
new beta version (2.0 beta 8)
Merge branch 'master' into ice-cream-sandwich