dsg<s
Merge branch 'merge-1' into master-neu

Conflicts:
	src/Error.cpp
	src/gui/BarChartView.cpp
	src/gui/BarChartView.hpp
	src/gui/GenericView.hpp
fast 12uhr
almost running
last commit still dont work :-(
more or less finished
Merge remote-tracking branch 'origin/patrick_der_letzte' into gui_marius

it has to be called "finished"

Conflicts:
	src/gui/BarChartView.cpp
	src/gui/BarChartView.hpp
	src/gui/GenericView.hpp
	src/gui/MainGui.cpp
	src/gui/RawDataView.cpp
	src/gui/RawDataView.hpp
insert correct RawDataView files
Merge pull request #22 from tavaron/gui_marius

Gui marius