added custom dialog to choose suggest or accepted order
Merge origin/master