Merge branch 'develop' of...

Merge branch 'develop' of https://webgate.ec.europa.eu/CITnet/stash/scm/~emkrispmi/vecto-sim into feature/VECTO-110-documentation

Conflicts:
	User Manual/GUI/ENG-Editor.html
	User Manual/GUI/GBX-Editor.html
	User Manual/GUI/VEH-Editor.html
	User Manual/GUI/mainform.html
	User Manual/GUI/pics/ENG-Editor.PNG
	User Manual/GUI/pics/GBX-Editor.PNG
	User Manual/GUI/pics/VEH-Editor.PNG
	User Manual/fileformat/VCDB.html
	User Manual/fileformat/VDRI.html
	User Manual/fileformat/VMOD.html
	User Manual/fileformat/VSUM.html
	User Manual/general/Shift.html
	User Manual/general/cd.html
	User Manual/main/changelog.html
	User Manual/main/head.html
	User Manual/main/index.html
	User Manual/main/start.html