Homec4science

rAKA/master
bugfixes/contact_mechan…