enabled proguard
Merge branch 'master' into android-1.5
nested lists
Merge branch 'master' into android-1.5