Working on Curves
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/util/io/fileformat/obj/parsing/obj.y
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/util/io/fileformat/obj/parsing/obj.y