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

Conflicts:
	build/classes/dti/internalballistics/AddSectionPopup.class
	build/classes/dti/internalballistics/MainWindow$10.class
	build/classes/dti/internalballistics/MainWindow$11.class
	build/classes/dti/internalballistics/MainWindow$12.class
	build/classes/dti/internalballistics/MainWindow$13.class
	build/classes/dti/internalballistics/MainWindow$14.class
	build/classes/dti/internalballistics/MainWindow$15.class
	build/classes/dti/internalballistics/MainWindow$16.class
	build/classes/dti/internalballistics/MainWindow$17.class
	build/classes/dti/internalballistics/MainWindow$18.class
	build/classes/dti/internalballistics/MainWindow$19.class
	build/classes/dti/internalballistics/MainWindow$2.class
	build/classes/dti/internalballistics/MainWindow$20.class
	build/classes/dti/internalballistics/MainWindow$21.class
	build/classes/dti/internalballistics/MainWindow$22.class
	build/classes/dti/internalballistics/MainWindow$23.class
	build/classes/dti/internalballistics/MainWindow$24.class
	build/classes/dti/internalballistics/MainWindow$25.class
	build/classes/dti/internalballistics/MainWindow$26.class
	build/classes/dti/internalballistics/MainWindow$27.class
	build/classes/dti/internalballistics/MainWindow$3.class
	build/classes/dti/internalballistics/MainWindow$4.class
	build/classes/dti/internalballistics/MainWindow$5.class
	build/classes/dti/internalballistics/MainWindow$6.class
	build/classes/dti/internalballistics/MainWindow$7.class
	build/classes/dti/internalballistics/MainWindow$8.class
	build/classes/dti/internalballistics/MainWindow$9.class
	build/classes/dti/internalballistics/MainWindow.class
	build/classes/dti/internalballistics/TestSVG2.class
	build/classes/dti/internalballistics/cad/OnClickAction.class
	build/classes/dti/internalballistics/cad/OnLoadAction.class
	build/classes/dti/internalballistics/cad/SvgOnHoverAction.class