Merge branch 'master' of github.com:jmeetsma/Code-Analysis

Conflicts:
	src/main/java/nl/ijsberg/codeanalysis/language/objectivec/ObjectiveCGraphBuilder.java
	src/main/java/nl/ijsberg/codeanalysis/report/QualityAssesment.java