v5
Merge remote-tracking branch 'origin/master'

Conflicts:
	ComputerGraphics_7_8.pro.user
	ComputerGraphics_7_8.pro.user.9c057f2
	curve.cpp
	curve.h
	curve.ui