add popupcontroller
fix merge
david add popup View Controller