Just before the presentation.
Merge branch 'fabian' of https://github.com/zypus/CAD into fabian

Conflicts:
	src/gui/QuadViewPanel.java