changes in model_import
Merge branch 'master' of https://github.com/gittenberg/WCM

Conflicts:
	WCM.py
	WCM_solvers.py