Merge branch 'master' of https://github.com/wpawgasa/InternalBallistics

Conflicts:
	src/dti/internalballistics/SectionProperties.form
	src/dti/internalballistics/SectionProperties.java
Merge origin/master

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