20.06.2014
Merge branch 'master' of https://github.com/wpawgasa/InterBallistic_v0.1

Conflicts:
	build/classes/dti/internalballistics/MainWindow$25.class
	build/classes/dti/internalballistics/MainWindow$26.class

build/classes/dti/internalballistics/MainWindow$ExtensionFileFilter.clas
s
	build/classes/dti/internalballistics/MainWindow.class
	build/classes/dti/internalballistics/SectionInfo.class
	build/classes/dti/internalballistics/cad/CAD.class