Fehlerabfang!
Merge branch 'master' of https://github.com/moph/WCETExplorer

Conflicts:
	WCETExplorer/Gui/Classes/FunctionChooser.cs
	WCETExplorer/Gui/WDllChooser.xaml.cs
Merge branch 'master' of https://github.com/moph/WCETExplorer

Conflicts:
	WCETExplorer/Gui/Classes/FunctionChooser.cs
	WCETExplorer/Gui/Gui.csproj
	WCETExplorer/Gui/Gui.csproj.orig
	WCETExplorer/Gui/WDllChooser.xaml.cs
Merge branch 'master' of https://github.com/moph/WCETExplorer