Bug repaired, data series feature added

Lattice upload bug repaired, model data series can now be multiplied by
a factor, working on plot resizing
Conflict resolution problem repaired