Merge from JunHo's master
Merge
Merge from JunHo's master
Merge branch JunHo's master
Add trans dialog's function
Merge branch JiMin's master

This include trans dialog's function