Change Map default location

Feature 1 has been tested in develop and is ready to be merged to Master.