Merge branch 'carlos' into develop

# Conflicts:
#	sdg-core/src/main/java/tfm/graphs/CallGraph.java
#	sdg-core/src/main/java/tfm/graphs/cfg/CFGBuilder.java
#	sdg-core/src/main/java/tfm/graphs/sdg/MethodCallReplacerVisitor.java
#	sdg-core/src/main/java/tfm/graphs/sdg/SDG.java
#	sdg-core/src/main/java/tfm/graphs/sdg/sumarcs/NaiveSummaryArcsBuilder.java
#	sdg-core/src/main/java/tfm/nodes/type/NodeType.java