merge
merge
add popover for ipad
merge
merge
merge