merge with origin/master of v1.20
change PopupView.java package name
pull from github/master, try merge&commit