Blabla

asdf
Merge remote-tracking branch 'origin/master'

Conflicts:
	V1.3/Win32/Debug/GlazingLTH.exe
	V1.3/Win32/Debug/constructionForm.dcu