stop plugin conflicts
icon uploads
Merge pull request #1 from ShaneShipston/master

Minor map builder issues