merge master into resources

updated mineralMine animation and increased size to 64 pixels square