Revert "Merge branch 'master' of https://github.com/paulstaab/scrm"

This reverts commit a22acdee65c89749b9ac5488bfe32e3e6f9975c0, reversing
changes made to eeba6ff68fcc80d2fa08d4dcd83a6841f7f45de8.
Merge branch 'master' into jz

Conflicts:
	src/forest.cc
	src/model.h