Add 5th degree polynomial interpolation to TOPPpy
Fix merging conflict in FrictionLimits.cpp