Merge origin/master

Conflicts:
	AVS_ImageCapturer/src/de/fh_koeln/avs/view/MainView.java