Refactoring of modeling.cpp is finished.
Merge branch 'master' of https://github.com/dgroup/m.n.o.

Conflicts:
	src/modeling.cpp