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
Added events that will be fired as the simulation progresses
WIP Refactored simulation heavily. Everything compiles and runs. Parameters pertaining to edge breaking/creation/rewiring are set to 0 and NOT through GUI as they should be.
Fixed calculation of event probability
Added new GUI elements for new simulation features (edge breaking/creation/rewiring) and connected them to back end. These are in a separate panel to minimise the size of Display
Now reading simulation parameters from GUI at startup
Bug fix to edge creation command in simulator; advanced sim parameter window's state is persistent
Aligned text fields better; added netbeans form files
Added a unit test for simulator and fixed a bug that it revealed. Removed a bunch of print statements
Fixed bug where value of speed slider was not store along with the other simulation parameters
Disabling instead of removing the recovery rate field when disease dynamics is SI
Tweaks to UI
Removed all references to log axis on degree distribution chart. This is not really needed for the lessons we have in mind and is harder to implement correctly than initially anticipated. This commit closes #16
Small layout fixes to the new disease controls (Related to #38).
Merge remote-tracking branch 'origin/vladi' into develop

Conflicts:
	src/main/java/view/Display.java
Resolved merge conflict
Fixed race condition in degree distribution chart. See comments in #38