Merge from JooHyun

It include finder dialog and some relation resources