fixed NPE in AlertDialog
Merge remote-tracking branch 'origin/1.x' into 1.x
fixed alert dialog operation
updated version