merge
Merge
update beandetailviewcontroller
Merge remote-tracking branch 'origin/shengzhc' into Ark