Should resolve issue #19
Merge and small adjustments

Conflicts:
	src/no_de/inf5090/visualizingsensordata/userInterface/VideoCapture.java