Fixed WMC and CC metrics
Merge branch 'dev' of github.com:ossmeter/ossmeter into dev