Integrete new marker
Merge branch 'master' of github.com:kynan/beakon
Map fixes.