[must/win]

- Temp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/argument.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/diagnostic.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/movespecies.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/plasma.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/updatefield.cpp
[must/win]

- Temp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/argument.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/grid.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/grid.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/lib.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/plasma.cpp
[ubuntu12]

- Temp
	new file:   Plasma1D/Makefile
	new file:   Plasma1D/data/input1
	new file:   Plasma1D/data/input2
	new file:   Plasma1D/data/input3
	new file:   Plasma1D/manual
	new file:   Plasma1D/parameters.h
	new file:   Plasma1D/src/callplot.c
	new file:   Plasma1D/src/data.h
	new file:   Plasma1D/src/hybrid1d.c
	new file:   Plasma1D/src/p4.c
	new file:   Plasma1D/src/plotlib.c
[must/win]

- Temp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/grid.cpp
Merge remote-tracking branch 'origin/master' into develop/features
Merge remote-tracking branch 'origin/must/win' into develop/features
Merge remote-tracking branch 'origin/ubuntu12' into develop/features
Merge branch 'develop/features'