qdasda
Merge remote-tracking branch 'origin/master'
asdas
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
application.properties
mingi teema
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
	src/ee/ut/math/tvt/salessystem/ui/model/PurchaseHistoryTableModel.java
	src/ee/ut/math/tvt/salessystem/ui/tabs/StockTab.java
ma
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties
	src/ee/ut/math/tvt/salessystem/ui/tabs/StockTab.java
Merge branch 'master' of https://github.com/ReinhardVuks/navus

Conflicts:
	application.properties
	src/ee/ut/math/tvt/salessystem/ui/model/SalesSystemModel.java
Debugging done
Merge remote-tracking branch 'origin/master'