comment out oauth code
add more on PopupWindow
Merge remote-tracking branch 'origin'