Merge branch 'develop/features'
[develop/features]

- Temporary
Merge remote-tracking branch 'origin/develop/features' into develop/features
Merge remote-tracking branch 'origin/develop/features' into develop/features
[develop/features]

- Temp
	deleted:    Plasma1D/Makefile
	deleted:    Plasma1D/data/input1
	deleted:    Plasma1D/data/input2
	deleted:    Plasma1D/data/input3
	deleted:    Plasma1D/manual
	deleted:    Plasma1D/parameters.h
	deleted:    Plasma1D/src/callplot.c
	deleted:    Plasma1D/src/data.h
	deleted:    Plasma1D/src/hybrid1d.c
	deleted:    Plasma1D/src/p4.c
	deleted:    Plasma1D/src/plotlib.c
	deleted:    PlasmaTemp/p4.c
	deleted:    PlasmaTemp/plasma.c
	deleted:    PlasmaTemp/plasma.f