Fix the picEditActivity
Merge branch 'master' of https://github.com/zhoumopashan/pashantest into dbg_zhoumopashan_dev