Merge pull request #20 from vladislavdonchev/develop

Custom node icons
Revert "Merge pull request #20 from vladislavdonchev/develop"

This reverts commit 02ea3b87630cb3f293853aa81f103d5cf39e9967, reversing
changes made to 2ef626af7488f096a1d4e7cc9967ddfab6979832.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/model/MyVertex.java
	src/main/java/view/CustomMouse/CustomPopupPlugin.java
	src/main/java/view/CustomVisualization/CustomVertexRenderer.java
	src/main/resources/icons/photorealistic/ic_access_point.png
	src/main/resources/icons/photorealistic/ic_access_point_immune.png
	src/main/resources/icons/photorealistic/ic_access_point_infected.png
	src/main/resources/icons/photorealistic/ic_access_point_susceptible.png
	src/main/resources/icons/photorealistic/ic_computer_immune.png
	src/main/resources/icons/photorealistic/ic_computer_infected.png
	src/main/resources/icons/photorealistic/ic_mobile.png
	src/main/resources/icons/photorealistic/ic_mobile_immune.png
	src/main/resources/icons/photorealistic/ic_mobile_infected.png
	src/main/resources/icons/photorealistic/ic_mobile_susceptible.png
	src/main/resources/icons/photorealistic/ic_user_immune.png
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/controller/Generator.java
	src/main/java/view/Display.form
Fixed race condition in degree distribution chart. See comments in #38
Merge remote-tracking branch 'origin/develop' into develop
Added a lock to the data structure holding the nimber of infected vertices at each time step during a simulation to prevent concurrent modification errors caused by the GUI attempting to update between steps (when the data structure is being written to). This is a proper fix for #27 and the IndexOutOfBoundsException in #38.
The GUI and the simulation commands that alter the graph now lock on the graph to ensure the graph isn't modified while it's being rendered.
Merge branch 'Plovdiv-38' into develop

Conflicts:
	src/main/java/view/Display.java
Made one text box bigger as it was sometimes too small fit the text it contains
Fixed bug where the simulation would add multiple edges between a given pair of vertices
Removed print statement
Added Erdos-Renyi generator and default values for all fields in the generation panel; signed a bunch of files
Added a comment explaining peculiar behaviour
Fixed bug where infection rate and time step values from GUI were passed in the wrong order to simulation
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/view/CustomMouse/CustomGraphMouse.java
Changed the x-axis to show real time instead of simulation step
Fixed bug in formula for SI edge breaking probability
Changed chart x axis to float labels
Merge branch 'vladi' into develop

Conflicts:
	src/main/java/controller/Controller.java