code refactor on preferences
Merge branch 'beta' of https://github.com/ukanth/afwall into beta