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

Conflicts:
	POS/log/log.log
-
Merge branch 'master' of https://github.com/silver17/Silveri-meeskond

Conflicts:
	POS/build/classes/ee/ut/math/tvt/silveri_meeskond/util/HibernateUtil.class
	POS/build/jar/log4j.xml
	POS/build/jar/silveri_meeskond.jar
	POS/log/log.log
	POS/version.properties
Praks.