Integrating MiniMap as a Dialog Box
Merge origin/master