renamed plot1.h to plot.h
Merge branch 'sdev' into develop