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
Merge remote-tracking branch 'origin/develop' into develop
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/java/view/CustomMouse/CustomGraphMouse.java