Vision Code
Camera control and
Merging
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/Config.java
	src/core/Delta.java