Display current location on map
Merge branch 'master' of https://github.com/PimV/WorldOfRogues-CPlusPlus

Conflicts:
	WorldOfRogues/WorldOfRogues/View.cpp
Improved view displayMap()