test
Merge branch 'master' of https://github.com/JaanJanno/A-Team-1.git

Conflicts:
	POS/src/ee/ut/math/tvt/salessystem/domain/data/HistoryItem.java
Merge branch 'master' of https://github.com/JaanJanno/A-Team-1.git