changes in some view controllers
nthg
Merge remote-tracking branch 'upstream/master'
corrected error in popover
nthg
nthg
cmtd