Added MOC converter. Test is underway.
Fixed a potential bug in NetClusConverter.java.
Fixed a bug in Util.java when parsing a Calendar object from a string
Merge branch 'master' of github.com:elia-polo/NeosThesis

Conflicts:
	src/utils/Util.java
Fixed few merge errors
Merge branch 'master' of github.com:elia-polo/NeosThesis

Conflicts:
	src/main/UsersGraph.java