Merge remote-tracking branch 'origin/master'

Conflicts:
	Constructor/include/ObjectConstructor.h
	Constructor/src/ObjectConstructor.cpp
	Library/src/ConstructionLibraryPrimitives.cpp
	include/Constructor.h