#1156 and #578 fixed (reinit in MassWithStopAndFriction is in algorithm section which is no longer allowed).
Rewrote model, so that reinit is used in equation section

git-svn-id: https://svn.modelica.org/projects/Modelica/trunk@6606 7ce873d0-865f-4ce7-a662-4bb36ea78beb