Multiple marker changes

Here is a branch with all the changes for multiple markers on the static maps

Cheers!
Johnny