update getPicActivity
Merge branch 'camera' into develop
Merge branch 'develop'