Added additional typing phase: type var resolution. This phase replaces all type vars by their types
Implemented convergence criterion
Merge branch 'devel'