Merge origin/master

Conflicts:
	src/dti/internalballistics/SectionProperties.form
	src/dti/internalballistics/SectionProperties.java