beta activity setting
Merge branch 'master' of https://github.com/farahs/MWallet