enabled proguard
Merge branch 'master' into beta
nested lists
Merge branch 'master' into beta