Custom map icon functionality.
Merge branch 'nManos'
Fix merge conflicts