For merge
Merge branch 'XWT' of github.com:KIV-ASWI-PL2014/Director into XWT
Merge branch 'XWT' of github.com:KIV-ASWI-PL2014/Director into XWT

Conflicts:
	Director/Forms/MainWindow.cs