Merge remote-tracking branch 'origin/master'

Conflicts:
	src/control/Controller.java
	src/imageProcessing/RealCamera.java