More Refactoring in savedoptions
Merge branch 'master' of https://github.com/citruspay/open-android