30-06-2014 1613
Merge branch 'master' of https://github.com/wpawgasa/InterBallistic_v0.1

Conflicts:
	nbproject/private/private.properties
	src/dti/internalballistics/MainWindow.java
	src/dti/internalballistics/cad/CAD.java