Changes to have autogains maker
added mass.dat back
Fixed merge conflicts