merging master into gui
forgot a conflict
Minerals are now displayed on the minimap
fixed merge conflicts
Got rid of log messages.  Minerals are now displayed on the minimap