Updated ThreatMap, that it doesn't seperate attacks and portscans

src/de/tudarmstadt/informatik/hostage/ui2/fragment/ThreatMapFragment.java

@@ -260,13 +260,9 @@ public class ThreatMapFragment extends Fragment implements GoogleMap.OnInfoWindo
 
 				sMap.addCircle(circleOptions.center(center).radius(100.0 + radius).fillColor(color));
 				Marker marker = sMap.addMarker(new MarkerOptions()
-						.title(ssid  + ": " + area.numAttacks + (area.numAttacks == 1 ? getResources()
-								.getString(R.string.attack)
-								: getResources().getString(R.string.attacks) 
-								+ " + " + area.numPortscans + (area.numPortscans == 1 ? getResources()
-								.getString(R.string.portscan)
-								: getResources().getString(R.string.portscans)))).position(
-								center));
+						.title(ssid  + ": " + (area.numAttacks + area.numPortscans) + ((area.numAttacks+area.numPortscans)  == 1 ? getResources()
+								.getString(R.string.attack) : getResources().getString(R.string.attacks)))
+								.position(center));
 				marker.setIcon(bitmapDescriptor);
 
 				sMarkerIDToSSID.put(marker.getId(), ssid);