Due to issues with case sensitivity, some older files didn't get updated.

For example: There are two files, StorageWrite.cpp and storagewrite.cpp.
The lowercase one was updated, but on Windows only one file exists. The
CamelCase file was updated with the changes of the lowercase one. This
commit just merges everything.

	deleted:    storagewrite.cpp (Case Conflict 1)
	deleted:    storagewrite.h (Case Conflict 1)
	modified:   StorageWrite.cpp
	modified:   StorageWrite.h
	modified:   ../../../GUITrial1-build-desktop/ui_mainWindow.h