obsolete dir preference activity has gone
Merge branch 'beta' into beta-ics
obsolete code
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into betayota