Testing VCS
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/core/view/Renderer.java