refactoring. part 9 & mantis mix

git-svn-id: http://farmanager.googlecode.com/svn/trunk@12100 ea59307d-ff68-5b67-5a21-acd59c66a581