DFSDF
Merge branch 'master' of https://github.com/ReinhardVuks/navus

Conflicts:
	.settings/org.eclipse.jdt.core.prefs
removed unused imports
db first editon of ten ten to come
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
	src/ee/ut/math/tvt/salessystem/ui/tabs/PurchaseTab.java