Merge remote-tracking branch 'alexandre/ni-merge' into HEAD

Conflicts:
	src/nitmetrics.nit

diff --cc src/metrics/inheritance_metrics.nit
Simple merge

diff --cc src/metrics/metrics_base.nit
index ed2ab9a,627af78..cce151d
--- 1/src/metrics/metrics_base.nit
--- 2/src/metrics/metrics_base.nit
+++ b/src/metrics/metrics_base.nit
@@@ -17,9 -17,8 +17,9 @@@
  # Helpers for various statistics tools.
  module metrics_base
  
- import modelbuilder
+ import model_utils
  import csv
 +import counter
  
  redef class ToolContext
  

diff --cc src/metrics/rta_metrics.nit
Simple merge

diff --cc src/nitdoc.nit
Simple merge