Homec4science

rAKA/master-stable
bugfixes/contact_mechan…