Merge branch 'master' of github.com:elia-polo/NeosThesis

Conflicts:
	src/main/UsersGraph.java
Merge branch 'master' of github.com:elia-polo/NeosThesis

Conflicts:
	src/main/UsersGraph.java