stuffff
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/build/classes/ee/ut/math/tvt/silveri_meeskond/util/HibernateUtil.class
	POS/data/POSdb.script
	POS/log/log.log