moved map marker code
Merge branch 'master' of https://github.com/Valtech-NAS/Alpha
couple of dll path issues fixed