Vorschau-Fenster
Merge branch 'master' of https://github.com/ExVision/ISSA_2014_Gruppe1

Conflicts:
	IS-STA-Bildeditor/IS-STA-Bildeditor/Bildeditor.Designer.cs