minimap fixes
merging with minimap fix
Merge branch 'master' of github.com:paulaluri/Feuds, merging with minimap fix