ppnw
Merge remote-tracking branch 'origin/master'

ppnw 2
switchd back to obj in adpidetailview