[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
[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'
[develop/features]

- Temp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/PlasmaSimulationAlpha.vcxproj
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/argument.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/diagnostic.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/grid.cpp
[develop/features]

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

- Temp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/argument.h
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/diagnostic.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/grid.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/movespecies.cpp
	modified:   PlasmaSimulationAlpha/PlasmaSimulationAlpha/plasma.cpp
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
Merge pull request #1 from seagochen/develop/features

Develop/features
[develop/features]

- Temp
	new file:   Blitz/Makefile
	new file:   Blitz/a.out
	new file:   Blitz/array.cpp
	new file:   PlasmaTemp/main.cpp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into ubuntu12
[ubuntu 12]

- Temp
	modified:   main.cpp
[ubuntu 12]

- A PIC code is now available
	new file:   Makefile