Merge origin/master

Conflicts:
	src/dti/internalballistics/SectionProperties.form
	src/dti/internalballistics/SectionProperties.java
Merge branch 'master' of https://github.com/wpawgasa/InternalBallistics

Conflicts:
	src/dti/internalballistics/AddSectionPopup.java
	src/dti/internalballistics/InternalBallistics.java
	src/dti/internalballistics/MainWindow.form
	src/dti/internalballistics/MainWindow.java
	src/dti/internalballistics/PropellantProperties.java
	src/dti/internalballistics/SectionProperties.java
	src/dti/internalballistics/SizeOfShape.java
	src/dti/internalballistics/cad/CAD.java
	src/dti/internalballistics/cad/SvgOnHoverAction.java
18-06-2014 1808
Merge branch 'master' of https://github.com/wpawgasa/DTI-Link

Conflicts:
	dist/DTI_Link.jar