resolved merge conflicts
some changes to the TreeIterator. untested, though
removed main.cpp from version control
Merge branch 'master' of github.com:G-Node/pandora
Merge branch 'master' of github.com:G-Node/pandora into odml