Revert "Map preference and waypoint dialog moved to drawer menu."
Merge pull request #926 from osmandapp/revert-924-mappref

Revert "Map preference and waypoint dialog moved to drawer menu."