Added new mechanism to store map markers, broke marker placement in progress.
Merge branch 'master' of https://github.com/pennja01/NorseSquare