proxyText /store/ from /sdcard/
conflict resolution
Merge branch 'master' of https://github.com/jaywhy13/gkco-mobile-java